Commits
- Commit:
863cc633e270c0edf587982ac9faccf7bb28f339
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
bff07ce328569d14e4638b7a32f4a92eb32ecc9e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove stray .Pp that I overlooked in my previous commit
- Commit:
fd220d9f8ebb7cb2c09804f0d8ed79dcfbe1d71a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
apply brevity tweaks for newly added keyword docs
- Commit:
4390d6c167c321d53ad289366248325c8e0bfcf5
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
6b483b319568902f913006779dad34b89cb4c979
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reword commit keyword argument descriptions in got.1 for brevity
- Commit:
10d732845e8ec391220bf0cf0b082cf021782965
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reorder some paragraphs in got.1 to make default behaviour easier to spot
- Commit:
c8d1a97c8f1deb9cb6fae25376d41d8549d28de4
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
e764eb5bc6671e7ecb9af487ced338743d239686
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid HEAD when talking about a work tree; HEAD is specific to the repository
ok jamsek
- Commit:
19a7924f3e98de860b409b8480b10b57ce16914e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move discussion of keyword arguments to -c into separate paragraphs
- Commit:
fd7552d245966f4a57fdc5ec287c3226d5145391
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
ee27b57e0fcb14468a5b8a9cd8414b475267cddb
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- 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:
e19d5545f96f74a0bf980c62af9900f76059e439
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix broken sentence in got.1 (was missing a word)
- Commit:
7b53188e4c59d5ce295c92624cacdeee16881abd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently mention 'got merge' as an alternative to 'got rebase' in got.1
- Commit:
a6c2ea42da6e1783b7d7d50693d18a4c778cde18
- From:
- James Cook <falsifian@falsifian.org>
- Date:
histedit, rebase: document -c, -C are compatible
- Commit:
18877383a0d783b0b642a27b16ccd3d1a212c8a3
- From:
- James Cook <falsifian@falsifian.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:
481cdc746b012203f39047cbc55f8b65ae40d046
- From:
- James Cook <falsifian@falsifian.org>
- Date:
add -M option: tell got merge not to fast-forward
ok stsp@
- Commit:
9c8a62dba4cf8662616c66f8fa0c53d1000ecf40
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
typo
- Commit:
a60eb2cc0fad47d21b6c6329245e25f548245c00
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tweak wording in got.1 which suggested that use of rebase was mandatory
- Commit:
de25a6106ad608b69412c95fa0c4affe6c8c3ac6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
explain why the first 'got clone' example in got.1 will often fail
- Commit:
77a54eed10d82b08ac3902b29ff491ef053169ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
provide a 'got merge' example in the EXAMPLES section of got.1
- Commit:
1334230721068ac62f5ea69c359962cdedb4df60
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent 'got merge' from creating commits on branches outside of "refs/heads/"
ok op, james
- Commit:
b88936d3f94e26ab32d9ef5d893b39fe633c6485
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got add' more forgiving about unversioned paths on the command line
When users run 'got add *' the shell may pick up already versioned files
and trigger errors about paths being in an unexpected status. Expand the
check which previously only allowed files in added status to be double-added
to cover the following status codes which are all safe to ignore: A M C m
This should make bulk additions of files a bit easier in most cases.
Problem reported by robert@
ok jamsek
- Commit:
179f9db092046395efaa1dc9e767a1ec109e1174
- From:
- James Cook <falsifian@falsifian.org>
- Date:
Implement fast-forward merges.
Split part of got_worktree_merge_prepare into a new function,
got_worktree_merge_write_refs, since that part doesn't make sense in the
fast-forward case.
ok stsp@
- Commit:
0ffe39b0c5a0f782cded7ffb2154b89a1c3c2086
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show how to fetch a pull request in got.1 pull request example section
- Commit:
35d2583f834a66f801dc229002d45e735882ba78
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow no-op merge commits to be created
Requested by James Cook