Commits
- Commit:
ba133bf3690a03e4b8ae2dceb5d9991456e62c10
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document that the log -d option implies log -P
We did consider making -d and -P options conflict but doing so would
not be very helpful. Instead, document -d as a superset of -P.
ok op, jamsek
- Commit:
e63e417467632bfb49b2778bba964f0a14d507ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
undo unrelated man page change from 1050403b806ca85666ad4b6a9e83953fdbb5298a
- Commit:
a6153ffb9ee91bb4fc544a98fae8d50cf2963841
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotd: stop logging "unexpected end of file" when a client decides to disconnect
- Commit:
ef1538260f78376b6fb605ffb10d682f5877afc2
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: allow 'got log -x' to accept keywords
Suggested by Lucas on IRC.
ok stsp@ and op@
- Commit:
44d79efab98b7f1502b7d4a5b66e5890f16180d8
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: improve reporting accuracy in branch listing output
As suggested by stsp, show the out-of-date symbol for the work tree branch if
it is not only out of date in relation to the branch tip but also if it
contains mixed commits. Update regress and add new test to check for this case.
Also, explain the mixed commit condition of * and ~ markers denoting work
tree state in got(1) branch -l docs.
ok stsp@
- Commit:
affd85fdd69bb67d27045196a798015ad4479e0d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove stray .Pp that I overlooked in my previous commit
- Commit:
9f625d2da2debfec13bfb4db5c53892f6b405755
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
apply brevity tweaks for newly added keyword docs
- Commit:
3795e2b655387a472683ffdeb63c6ff53b9b1e14
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: enable more commands to accept commit keywords
More work adding commit keyword support to the blame, cat, ref, tag, and tree
commands. With this, all Got commands that take a <commit> option argument
or operand now support keywords. Regress flub saved by op!
fixes + ok op@
- Commit:
a290e4b40845ee5d251cdf5e4d9b31693f37ea49
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reword commit keyword argument descriptions in got.1 for brevity
- Commit:
482b0b83833675d8c750a996c3a9db1fb99e1e8d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reorder some paragraphs in got.1 to make default behaviour easier to spot
- Commit:
fb8851205d3a6b7f0c457b2091c3b335d0f7e4e3
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
expand support for commit keywords to more got commands
Add the ability to use keywords in the backout, branch, checkout, cherrypick,
and patch commands. Includes some basic regress tests for the new commands,
and also some more contrived test cases for 'got log -c[:]keyword[:(+|-)[N]]'.
ok stsp
- Commit:
1b9900744f5cac2de071add4a1b678cf36713b63
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
avoid HEAD when talking about a work tree; HEAD is specific to the repository
ok jamsek
- Commit:
953c67e2c21eafa2c682fe83f77cfabd955358f7
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move discussion of keyword arguments to -c into separate paragraphs
- Commit:
9139e0049a78ea0a4d285e4e5e4874893c0b9a09
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement support for keywords as got <commit> arguments
This begins enabling the use of keywords in got wherever commit ids or
references are used, with more work intended to expand support across all
such instances (e.g., branch, checkout, etc.), and add more keywords.
The keywords ":base" and ":head" can be passed to 'got {diff,log,update} -c'
commands as a substitute for the corresponding commit hash id. Keywords and
references can also be modified by appending a ':+' or ':-' and an optional
integer N to specify by first parent traversal the Nth generation descendant
or antecedent, respectively. If N is omitted, a '1' is implicitly appended.
tweaks + ok op and stsp
- Commit:
bccae03fdbe2f0902e2447972ef9f63ffef57c3c
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
abort histedit if the user quits the editor without saving the script
Also document that the commit/import/tag operations are aborted when
the user fails to save the log message from the invoked editor.
ok jamsek stsp
- Commit:
87c986b7f0d0e0e057ff53e14386faeac395878c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix broken sentence in got.1 (was missing a word)
- Commit:
1a70a2078b605112beede15564122b377eeba92d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
consistently mention 'got merge' as an alternative to 'got rebase' in got.1
- Commit:
79878eb8ee8fb9380505ae4a7a252cf38dc273d2
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
histedit, rebase: document -c, -C are compatible
- Commit:
dcd455ee64953215a90ed4427762b5566d7e0047
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix option processing for 'got merge'
Don't make -C imply -c (a break statement was missing). Detect -an and
-cn conflicts. Simplify by removing unneeded check for conflicting -aC
(since -C requires -c, we can rely on the -ac conflict being detected).
Update the man page to say -cC is allowed.
- Commit:
31009ade0db15d36e637f180ba64b28110b25208
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add -M option: tell got merge not to fast-forward
ok stsp@
- Commit:
862951558c077adda5fda148c1666216da6d0edf
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
typo
- Commit:
1fa75a87f7cf94849260387869faae04e32a6f2a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tweak wording in got.1 which suggested that use of rebase was mandatory
- Commit:
f357763f32830a6499489869d8501ddd01f9c3e3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
explain why the first 'got clone' example in got.1 will often fail
- Commit:
0b83b8f6353b650215b9bca597657608dcbe8a9d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
provide a 'got merge' example in the EXAMPLES section of got.1
- Commit:
4434a15a4719fdf3ae54026f89dc2c9fc8692d16
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
prevent 'got merge' from creating commits on branches outside of "refs/heads/"
ok op, james