Commit Briefs

abc59930d5 Christian Weisgerber

indentation fixes



e600f1246e 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



766841c297 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@


b2118c49a1 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



5036ab18bf Stefan Sperling

make 'got update' skip conflicted files

ok millert@


7f47418fd4 Stefan Sperling

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

but warn users about the garbage collection problem


70e3e7f5a1 Tracey Emery

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

ok stsp



f2a9dc41d8 Tracey Emery

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

ok stsp




1ebedb77e0 Stefan Sperling

teach 'got commit' to tweak the executable bit of a file


2822a3526b Stefan Sperling

add 'got integrate' command



e620954619 Stefan Sperling

untie cancel callback declaration from the work tree


33aa809d4f Stefan Sperling

implement 'revert -p'


2e1f37b029 Stefan Sperling

implement 'got unstage -p'


a7c9878d5b Stefan Sperling

make stage -p show the number of changes in a file


b353a198c5 Stefan Sperling

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


dc424a06a9 Stefan Sperling

initial 'got stage -p' implementation


ad493afcc0 Stefan Sperling

initial 'got unstage' implementation


537ac44b6c Stefan Sperling

pass staged blob ID to status callback