Commits
- Commit:
de71b616b660daefdfc491cf848bc1c61c1df208
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
mention additional copyright holders in got(1)
- Commit:
f6fad9f6e58b7cabe35526dfdb3d8d231497e8e3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add two more authors how I missed during my sweep of commit history
- Commit:
b345cf8fd5187a40cbb157aa44820e8ec2e876c0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Xr gotweb(8) from got(1)
- Commit:
bee5044f5f3140a149b6f619a764b42dcc676896
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
typo
- Commit:
60c730801bf3509b29637ee0f1a951dada806acb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
long overdue update of AUTHORS lists in man pages; based on commit history
- Commit:
27b10c3cfd1526a6dd9f8101b12531a99b3411e4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move 'got init' command to 'gotadmin init'
This functionality is better suited for gotadmin because it is
technically a server-side repository operation when we consider
the 'got' tool as the client-side tool.
I have plans to move 'got import' into gotadmin as well.
ok op@
- Commit:
839dd04fbdc0044b7d16b079a5ab390c8dca5f2f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document SSH-based signing and verification in got(1) and got.conf(5)
- Commit:
25eb584767361afbce3002356d91ff8d0a2a0ec0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
rename got.conf(5) fetch-all-branches to fetch_all_branches for consistency
Existing configuration files will keep working for now since the old name
with dashes is still recognized by the config parser.
- Commit:
68e8cedbff75686437a3d71b0c265fb66cbbbd75
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to show just one tag with 'got tag -l'
suggested by jrick
ok jrick jamsek
- Commit:
762b8e82159007814bc0eaacebf8c2ff2ad34cb5
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: use status G for merged files (and document it)
Suggested by stsp@. This makes possible to tell if 'got patch' used a
merge-base from the repository for the 3-way merge or did a simple
search/replace operation.
While here update the tests to look for the 'G' status and the manpage,
which was also missing the documentation for the 'C' status in got
patch.
ok stsp@
- Commit:
aba5482ebaaee13ae12a318b6be73e480fc5d557
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove outdated and overly-specific documentation of got log -s output
ok op@
- 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