Commits
- Commit:
9d6cabd51222f7506db617ee8a7b282823dde999
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: allow to strip path components
Move some bits from the libexec helper to the main process so we know if
the patch was generated by git or not and finally document the automatic
stripping of a/ and b/ prefixes added by git-diff(1).
ok stsp@
- Commit:
1a7a534e1938546579b58c933c11eb8ae9ef8429
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tweak wording to make it clearer where the mentioned -u option applies
- Commit:
3b01d641c14e67930d70d9cc5fb8b06d0f782033
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
mention that 'got patch' is compatible with 'cvs diff -u' output
- Commit:
3f3a6472f94a10862046605b5a11129a4f97c33a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
mention that 'got patch' can read diffs produced by Git, to avoid any doubt
- Commit:
e38d4cdede4142c7bae75cc884f5ce57dad297af
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
subordinate clauses preceding the main clause are offset by a comma
- Commit:
60aa1fa0d1bdadc23596e5d614d184525b17935c
- From:
- Omar Polo <op@omarpolo.com>
- Date:
augment patch progress callback with hunks info; recover from errors
Augment got_patch_progress_cb by providing the hunks that were applied
with offset (or that failed) and the recoverable error encountered
during the operation (bad status, missing file, ...)
got_patch now proceeds when a file fails to be patched and exits with
GOT_ERR_PATCH_FAILED if no other errors are encountered.
While here, also add a test for the 'hunk applied with offset' case and
shrink test_patch_dont_apply and illegal_status by taking advantage that
'got patch' doesn't stop at the first error. (And add some other cases
to illegal_status too.)
discussed with and ok stsp@
- 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!
- Commit:
986288a659290f72e774dcf0cb43ba76b2c23c72
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix weird paragraph breaks in 'got patch' man page section
- Commit:
3e72b288de325b062a896dd092cc4a7625f76432
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
more 'got patch' man page tweaks
- Commit:
750a309349d99384187d53c0436ec4b404c1a112
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
some man page tweaks for 'got patch'
ok op@
- 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.
- Commit:
e9ce266e31923cc339954b331d273d9bba543f6f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add `got patch' command for applying unified diffs
- Commit:
4e12cd97c02ae412c5a247dfaffa22ad58dd98b4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
- Commit:
ef2f551e4634d795e79ad145eda2a1050f8b3cf9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -t option to 'got branch' synopsis in got.1 man page
- Commit:
f76670f06a0f4f426ea232a2dd02899fe3698cf2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add got branch -t option to sort listed branches by modification time
- Commit:
0f104432aecf1cda4672c5ff4e4d228f5aae1bdb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add got ref -t option to sort listed references by modification time
- 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!
- Commit:
2af6173593a21a43c9ee858646ac68d812039e12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document new 'got rebase' behaviour when commits do not need to be rebased
- 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@
- Commit:
8cb8da5b6d133f8130a9e4e828ca00ff0bb482ca
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
document "mg" as alias for the "merge" command
- 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
- Commit:
90e6e6204014e47bc38fb5bcaf041cfdad190718
- From:
- Klemens Nanni <kn@openbsd.org>
- Date:
Fix "mandoc -T lint -W style got/got.1" nits
- 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
- Commit:
b93c7142c142ac5699accd8dd259187a22e200fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
fa161f0bf4d34a678ba30bf62f5e8eec44ceb931
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update a CAVEAT in got.1 now that 'got merge' exists