Commit Briefs

Stefan Sperling

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


Stefan Sperling

improve got ref -d documentation: mention that objects won't be deleted

ok jrick


Josh Rickmar

Clarify log -x is inclusive

ok stsp


Stefan Sperling

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!


Stefan Sperling

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@




Stefan Sperling

add a 'reference' directive to remote repositories in got.conf(5)

Make use of this in 'got clone' to persist -R option arguments given on the command line in the cloned repository's got.conf(5) file.



Stefan Sperling

add a 'fetch-all-branches' configuration setting to got.conf(5)

Set fetch-all-branches in the got.conf(5) file created by 'got clone -a' in order to make a future 'got fetch' act like 'got fetch -a' by default.



Stefan Sperling

allow the 'got fetch' -l option together with the -q option

Make use of this in tests to hide useless output from ssh(1).


Stefan Sperling

make 'got clone' pin the fetched branch in got.conf(5)

Avoids relying on the server-side HEAD ref by default during future fetches.






Josh Rickmar

add histedit -f flag for folding shortcut

"please push it" stsp






Stefan Sperling

add got.conf(5) configuration file

ok tracey


Stefan Sperling

add -s option to 'got remove' which deletes files in a particular status

This makes it easy to deal with files that were deleted from disk by external tooling which modified the work tree. Such files are left in missing (!) status and can now be marked for deletion in bulk via 'got rm -s\! -R .' For consistency, modified (M) files can now be removed with 'got rm -s M' which implies 'got rm -f'. Prompted by feedback from krw@


Stefan Sperling

add -s option to 'got status' which acts as a status code filter

Advantages over using grep are that the list of codes is validated against a list of known status codes, and that it is easier to match staged files which can display status codes in one or both of two columns. Prompted by feedback from krw@