Commit Briefs
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
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.
Add got(1) command tab-completion for ksh(1) to EXAMPLES section.
Suggested by Clint Pachl, thanks!
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@
tweak the man page section about 'got send'
In particular, attempt to describe the -f option better.
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.
got.1: make double-quotes appear in the rendered man page as intended
Patch by Nam Nguyen
ensure that old commits remain referenced after rebase and histedit
Create automatic "backup" references which ensure that objects from the pre-rebase or pre-histedit state remain in the repository. A new -l option for 'got rebase' and 'got histedit' lists old commits. This makes it easier to recover from botched rebase or histedit operations. Removal of such objects currently requires got ref -d and git-gc. This will be made more convenient in the future. testing and ok jrick
Clarify log -x is inclusive
ok stsp
include remote branches in the output of 'got branch -l'
This makes it easier to discover the existence of copies of remote branches in the local repository, and fixes a missing asterisk in 'got branch -l' while the work tree is switched to a remote branch. Prompted by feedback from helg, thanks!
add 'got commit -F' option to commit with a log message stored in a file
To avoid accidents commit -F opens the prepared log message in an editor so it can be reviewed before the commit is created. For non-interactive use the -N option is required in addition to -F. ok millert@