Commit Briefs

Thomas Adam

show commit progress output when 'got merge -c' is used

Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@


Thomas Adam

add a 'got merge' command for creating merge commits

Additional testing by Thomas Adam. ok tracey


Christian Weisgerber

indentation fixes



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

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 a 'got info' command which displays work tree meta-data.

Remove the alias 'got in' for 'got init'. The 'in' alias was too close to either 'init' or 'info'. ok tracey, millert



Stefan Sperling

make 'got update' skip conflicted files

ok millert@


Stefan Sperling

make 'got checkout' and 'got update' work with read-only repositories

but warn users about the garbage collection problem


Tracey Emery

add -k option to 'got remove' to keep files on disk

ok stsp



Tracey Emery

add -R option to 'got remove' for recursive deletion

ok stsp





Stefan Sperling

add 'got integrate' command




Stefan Sperling

implement 'revert -p'


Stefan Sperling

implement 'got unstage -p'



Stefan Sperling

add 'q' response to 'got stage -p'


Stefan Sperling

initial 'got stage -p' implementation