Commits
- Commit:
4fe9456b4b22d120d0215786744a9f4c0762bf9a
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got log: sync match_commit from tog
So that 'got log -S' can match also the author and committer name, and
the commit ID too.
ok stsp@
- Commit:
314444e45ab5ffcb7b53c840c3eccf9b514fb70c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reword description of how got log -p and -P interact with got log -S
- Commit:
6fdca49ec99627a96cda79e00f938049a317e6ef
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to match committed patches with got log -p -S pattern
ok op@
- Commit:
e2f45bc4f455fec482b65cea685a7bc4594e157e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a missing .Pp to got.1
- Commit:
2f7ada206148cc1a3218669652926de2bdd3c04b
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add one-line output mode to got log with -s flag
-s for short. Moves log search to -S.
Patch by Evan Silberman
- Commit:
eaef698f325c42c0fd48c56b391b56ce1695b9e7
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: allow to reverse a patch
add a flag to got_patch to reverse a patch before applying and the -R
flag for `got patch'.
ok stsp@
- Commit:
d9db2ff90a20aac31e00f040738fd49a56b38d6b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
6f7394add7706226ed718bd6dc0d60885270a655
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tweak wording to make it clearer where the mentioned -u option applies
- Commit:
3eb4f6293effeabefeb3842df6c2d10e06886737
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
mention that 'got patch' is compatible with 'cvs diff -u' output
- Commit:
99e34129834bf2e107049196c977ec28e906c108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
mention that 'got patch' can read diffs produced by Git, to avoid any doubt
- Commit:
4b06140e73e558a1f44007eda8bbdc912a6c0a9c
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
subordinate clauses preceding the main clause are offset by a comma
- Commit:
49114f01f4c397e460d9d2d27619e841184b217a
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
bfc912128ca404176d8aebc46b2c89ee4926e1d2
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a dry-run/nop mode for got patch
with lots of help from stsp for the manpage bits!
- Commit:
443c08c91d6addcbfcb729b36d52896d6336fa14
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix weird paragraph breaks in 'got patch' man page section
- Commit:
4929098b50991a6640f81e8bfe7c0bf7b103b9a4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
more 'got patch' man page tweaks
- Commit:
07f74738a18008a5dc7571048fef967a248670eb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
some man page tweaks for 'got patch'
ok op@
- Commit:
2cfc25ace6abf08ff748259dc6687da834614ad5
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
069bbb862c310dff25056a8d02a59bded471478d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add `got patch' command for applying unified diffs
- Commit:
d64cc78a320df6e371662d50eba6332a7be001c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
- Commit:
053ccfc118036a493a587cbbe43b12c330d0011f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -t option to 'got branch' synopsis in got.1 man page
- Commit:
a0b48eaf75ca2f2a41f476012474a3d255c2e83d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got branch -t option to sort listed branches by modification time
- Commit:
2bf0fa54a55e054ffe4c688f49ecbd6a28101fe0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got ref -t option to sort listed references by modification time
- Commit:
d912d1250c98cc9f95e6d51ebb86173911e17b81
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.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:
d10218e7512ce57d66ac7ef9f7a3caeab7874e8a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document new 'got rebase' behaviour when commits do not need to be rebased
- Commit:
cc8021afc28da386d1cab85b4d74b632b90e0108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@