Commits

Commit:
899fcfdf4534887848844329dae7327bd810a432
From:
Omar Polo <op@omarpolo.com>
Date:
add a dry-run/nop mode for got patch with lots of help from stsp for the manpage bits!
diff | patch | tree
Commit:
986288a659290f72e774dcf0cb43ba76b2c23c72
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix weird paragraph breaks in 'got patch' man page section
diff | patch | tree
Commit:
3e72b288de325b062a896dd092cc4a7625f76432
From:
Stefan Sperling <stsp@stsp.name>
Date:
more 'got patch' man page tweaks
diff | patch | tree
Commit:
750a309349d99384187d53c0436ec4b404c1a112
From:
Stefan Sperling <stsp@stsp.name>
Date:
some man page tweaks for 'got patch' ok op@
diff | patch | tree
Commit:
dd6c3779b6533ba060e07dc68fdaf6b1e0e49d30
From:
Omar Polo <op@omarpolo.com>
Date:
improve `got patch' section of the manpage Simplify some phrasing, explain what preconditions `got patch' has and what happens to the work tree when an error occurs.
diff | patch | tree
Commit:
e9ce266e31923cc339954b331d273d9bba543f6f
From:
Omar Polo <op@omarpolo.com>
Date:
add `got patch' command for applying unified diffs
diff | patch | tree
Commit:
4e12cd97c02ae412c5a247dfaffa22ad58dd98b4
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got rm' behave like rm(1) for paths found missing on disk ok millert@
diff | patch | tree
Commit:
ef2f551e4634d795e79ad145eda2a1050f8b3cf9
From:
Stefan Sperling <stsp@stsp.name>
Date:
add -t option to 'got branch' synopsis in got.1 man page
diff | patch | tree
Commit:
f76670f06a0f4f426ea232a2dd02899fe3698cf2
From:
Stefan Sperling <stsp@stsp.name>
Date:
add got branch -t option to sort listed branches by modification time
diff | patch | tree
Commit:
0f104432aecf1cda4672c5ff4e4d228f5aae1bdb
From:
Stefan Sperling <stsp@stsp.name>
Date:
add got ref -t option to sort listed references by modification time
diff | patch | tree
Commit:
4683a10b65c55ef32afba4f4363b9da42c396b6e
From:
Klemens Nanni <kn@openbsd.org>
Date:
Fix mandoc HTML rendering for command aliases Replace hand-rolled parentheses with the proper mdoc(7) macro, otherwise the closing ")" ends up inside the command description. Reported by Josh Rickmar, thanks!
diff | patch | tree
Commit:
2af6173593a21a43c9ee858646ac68d812039e12
From:
Stefan Sperling <stsp@stsp.name>
Date:
document new 'got rebase' behaviour when commits do not need to be rebased
diff | patch | tree
Commit:
67b631c9e0d2c43ceeda1a387ba696b2d34a1035
From:
Stefan Sperling <stsp@stsp.name>
Date:
implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@
diff | patch | tree
Commit:
8cb8da5b6d133f8130a9e4e828ca00ff0bb482ca
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
document "mg" as alias for the "merge" command
diff | patch | tree
Commit:
e7ffb0b07b18c20ebb619f3879602d629d0fbbc6
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for multiple path arguments to 'got diff' positive feedback from Omar and kn ok kn
diff | patch | tree
Commit:
90e6e6204014e47bc38fb5bcaf041cfdad190718
From:
Klemens Nanni <kn@openbsd.org>
Date:
Fix "mandoc -T lint -W style got/got.1" nits
diff | patch | tree
Commit:
95f394e8917def2c11ce292b3a8f804d261b1d12
From:
Klemens Nanni <kn@openbsd.org>
Date:
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
diff | patch | tree
Commit:
b93c7142c142ac5699accd8dd259187a22e200fb
From:
Stefan Sperling <stsp@stsp.name>
Date:
add histedit -e option which runs the 'edit' script command for every commit ok jrick
diff | patch | tree
Commit:
fa161f0bf4d34a678ba30bf62f5e8eec44ceb931
From:
Stefan Sperling <stsp@stsp.name>
Date:
update a CAVEAT in got.1 now that 'got merge' exists
diff | patch | tree
Commit:
cd33da4893c91d59c1e0a4f296e07c08cfd82bcb
From:
Stefan Sperling <stsp@stsp.name>
Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
1fa4907213af37d50029ee33b989867f41f0f124
From:
Stefan Sperling <stsp@stsp.name>
Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
606719cd7bdc625a582f93ddbc966675568f0026
From:
Stefan Sperling <stsp@stsp.name>
Date:
document all reasons why 'got merge' might be interrupted
diff | patch | tree
Commit:
088449d31db27c8682d5e9dc737d92d05df6605e
From:
Stefan Sperling <stsp@stsp.name>
Date:
implement 'got merge -n' which interrupts before creating a merge commit
diff | patch | tree
Commit:
4e91ef1519233965edd1bbd83f6699f669c8f9d6
From:
Stefan Sperling <stsp@stsp.name>
Date:
make it possible to merge vendor branches with 'got merge'
diff | patch | tree
Commit:
f365d76274ee1ae2b57225686a0733176fc4bfb2
From:
Stefan Sperling <stsp@stsp.name>
Date:
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.
diff | patch | tree