Commits


implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@


document "mg" as alias for the "merge" command


add support for multiple path arguments to 'got diff' positive feedback from Omar and kn ok kn


Fix "mandoc -T lint -W style got/got.1" nits


Document command aliases in tmux(1) style, add tags for navigation This has the advantage of tags being located right by the full command; combined with tags ":tco" to search for the `co` alias will jump right to the `checkout` line, neatly showing everything without needing further navigation. tmux hint from Thomas Adam, thanks. OK stsp


add histedit -e option which runs the 'edit' script command for every commit ok jrick


update a CAVEAT in got.1 now that 'got merge' exists


interrupt 'got histedit' upon missing/unversioned/not-deleted files


interrupt 'got rebase' upon missing/unversioned/not-deleted files


document all reasons why 'got merge' might be interrupted


implement 'got merge -n' which interrupts before creating a merge commit


make it possible to merge vendor branches with 'got merge'


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.


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.


add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey