Commits
- Commit:
df3d7c3ef8853d0fa9182dd3f3023a4d5e222ce0- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
stop using the term 'obstructed' ambiguously in the got.1 man page
Specifically, obstructed files are versioned files which should be on disk
but have been replaced on disk by a non-regular file (e.g. by a directory).
The man page used the phrase "deletion was obstructed" which is unrelated
to the above concept and can be expressed as "deletion was prevented" instead.
- Commit:
88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
stop caring about obstructed versioned files in 'got merge'
Tyring to write a test to cover this case I found that obstructed files
are (correctly) detected as local modifications in the work tree. Thus
they trigger the pre-condition check for local modications and 'got merge'
will not even start to do any work in the presence of obstructed files.
- Commit:
10604dce6e625d11974fb5491598bbb54069e5d3- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
ac372b601e0be8eb794f071912ddb1efc81ea8a8- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
'got status' does not have a -q option; remove it from got.1 synopsis
- Commit:
df7dea6e70ae149a51b80d537544c007bdb03258- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -S option to 'got status' synopsis in got.1 man page
- Commit:
b043307bfaa7ea801d19677c0cdb5d4074c0c234- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got status -s and -S options conflict
- Commit:
00357e4dc78f7f5bd12eceaa07592ab743996e12- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add suppress status-code selection to got status. this allows for a quick way to
clean output without the use of ignore files. ok stsp
- Commit:
4ad4a1ec452e58730b6d841ae6a044ff53827e15- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add -q quiet mode to checkout and update. supressing output keeps the terminal
responsive on large repos. ok jrick stsp
- Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
- Commit:
a16d97bdc65b49050d622450d50642fa98eb3cc1- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove ancestry sanity checks from 'got cherrypick' and 'got backout'
While these checks might catch usage mistakes the performance overhead
of scanning the entire history of the current branch is not worth it.
Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's
src repository in usr.bin/rsync:
Before: 5m50.33s real 4m02.36s user 2m04.41s system
After: 1m04.92s real 0m28.24s user 0m36.54s system
Further performance improvements could be needed but this is a first step.
- Commit:
e1d27370ef5a6da06bbda0fc78bf629f1cb3ccd3- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Fix ksh completion example to complete the first arg only; from Clint Pachl
- Commit:
43e4eb1bf2ab96fb4ea1fb53f993913df354db94- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Add got(1) command tab-completion for ksh(1) to EXAMPLES section.
Suggested by Clint Pachl, thanks!
- Commit:
2f1457c6ccfe722888511926c09af843da3bee0d- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow deletion of refs/remotes/ branches with got branch -d
Also, make requirements for branch name arguments more flexible.
Absolute reference names are now accepted.
ok naddy@
- Commit:
a099809f2873564368fcd20d3d7be32ce4a5bc12- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
more manual page updates following the introduction of 'got send'
- Commit:
93a300b296848449897d95643acc8a689b0480b1- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
small man page spelling fixes
- Commit:
fd44090b628aa7213949d0e8bcc696bf651aaa91- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tweak the man page section about 'got send'
In particular, attempt to describe the -f option better.
- Commit:
f8a36e221091eb68b439ebe4eb07a5d03b335c28- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got send' command for sending changes to remote repositories
Known to work against git-daemon and github Git server implementations.
Tests by abieber, naddy, jrick, and myself.
Man page additions reviewed by Lucas.
- Commit:
161728eb26bf63ad53f11367358ea6190bad8968- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got fetch -X' option for deleting references created by 'got fetch'
- Commit:
643b85bcb48e24fd2ca96d415d8e61e1ceef9aad- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -X option for removing backups created by got rebase and got histedit
ok semarie
- Commit:
ff56836b1637f806bb308057ef9bd6d90b725568- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Make 'got add' always require the -I option in order to add ignored files.
- Commit:
e67867107a97eae4801a85636493efb4239a61cd- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
mention 'gotadmin cleanup' wherever Git's garbage collector is mentioned
- Commit:
7e36bc2b1f67a25dc320b059eca47d1449d8881d- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move todo items from got.1 caveats to gotadmin.1 as appropriate
- Commit:
edeec58d23dd51142c38473bb24acc0605159771- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove a todo item from got.1 caveats; 'gotadmin pack' can pack repositories
- Commit:
3217be6de1cc0e1f8b9e6f4928e99714958818a6- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in got.1, add -I to the synopsis line of the status command
- Commit:
f6343036aa4d7e3805a44832b566b531271c1c6d- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -I option for 'got status' to show files which match an ignore pattern