Commits
- Commit:
ebd4d9a0266bb7a7145bcd6138bf64a5b0c1d004
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
backout got stage -R option addition
The stage command is usually used in a recursive manner, like 'got commit'.
Forcing users to specify -R all the time is deemed too inconvenient in
practice.
discussed on IRC with Lorenz (xha), Omar, and Lucas
- Commit:
78775350960979fcef94573431a8735d28978fa5
- From:
- James Cook <falsifian@falsifian.org>
- Date:
update protocol lists
Document http and https protocols in got.conf(5). Copied from got(1)
except reworded the part that referred to got.conf(5).
Change "send directive" to "send block" in got(1), since got.conf(5)
says there's "one configuration directive per line".
Adjust table widths: longest protocol name is now "https".
- Commit:
bb068081f1967fa4f4f5c5e6db0d1065244f6539
- From:
- "Lorenz (xha)" <me@xha.li>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
require -R option for staging or unstaging directory contents
-R is needed on almost all other commands so this makes things consistent.
Patch by Lorenz (xha)
- Commit:
449ea7f22083788e4dc012f4ab6649594f92a563
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
drop git+ssh protocol name from documentation; Git has done the same
We can keep accepting git+ssh for backwards compatibility with
existing configs.
- Commit:
bf7104912e8cd12ec0b6f91fff2bec7759b43f09
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
doc tweaks regarding HTTP protocol support
- Commit:
da442b3fa9d5c38fd34163d717dd07a26cd35ceb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
man page updates for HTTP clone/fetch support
- Commit:
124eeb84c84b5d49a94e0210e4add23c6da93b47
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got.1: escape Eq since it's a GNU roff macro
`.Op Fl Eq' gets rendered as [-] with groff because Eq it's a macro.
Escape it to get it rendered correctly. Discussed with bentley.
Reported by casaca on the IRC channel, thanks!
- Commit:
a4656c38219b986dc7919a9c5c36195b9dd0acee
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
small man page fix, spotted by op@
- Commit:
f4ab0e5770b96257cb1a43cfe292daa54f2b402e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got status' display interrupted rebase, histedit, and merge operations
When an operation is interrupted add a trailing message to status output
which displays the operation and branches involved.
This information will be useful when diagnosing problem reports and it
helps new users with contextualizing multi-operation work tree state.
ok op@
- Commit:
a397e3fbad25f5da2f4a33e1d2ac8248f32aa24b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
man nits; found with mandoc -Tlint
- Commit:
83e5e9a11730a93d948aabbafdb2592713eb6f28
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add log -t option which enables topological sorting of commits
Because the current implementation of toposort is expensive, add a
flag which enables it. I would rather not have this option and just
use toposort by default, however more work is required to achieve
acceptable performance.
ok op@
- Commit:
d0980f09b20ac878dcbc62fb940adf273a363f00
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
got.1: use typewriter-style quoting in got.conf author example
Otherwise copy/pasting from the man page to got.conf produces syntax errors.
Noticed by mlarkin@
- Commit:
14eb0fefd04d63b1a8d626e72c953a811a403f7d
- From:
- "Lorenz (xha)" <me@xha.li>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
simplify usage of the 'mesg' histedit script command
The 'mesg' script command now requires a commit ID as its argument,
rather than being tied to a preceding 'pick' or 'edit' command.
The old model was too confusing for new users, in particular for people
used to Git's rebase -i squash semantics.
The 'mesg' command is now semantically equivalent to the 'pick' command
and additionally opens the log message in an editor.
The new syntax is simpler to use but also requires that we drop support
for one-line log messages inside the histedit script, with a commit ID
taking its place in the argument space. We don't believe this feature was
used much, and that a simplified usage model is more beneficial overall.
Patch by Lorenz (xha)
ok jamsek
- Commit:
b610c677694f4118404d76458ed7f75c0feb4bab
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
slightly reword 'got merge' documentation to hopefully be more clear
- Commit:
123cba5ad6fe36893f2019bb0a806db3f3139dde
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
df32781bdd73c921eda5c02a1db0df30c4d89f1c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
undo unrelated man page change from 1050403b806ca85666ad4b6a9e83953fdbb5298a
- Commit:
1050403b806ca85666ad4b6a9e83953fdbb5298a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
gotd: stop logging "unexpected end of file" when a client decides to disconnect
- Commit:
93c250cd168c2e1d2f9997774c87cc2718373404
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: allow 'got log -x' to accept keywords
Suggested by Lucas on IRC.
ok stsp@ and op@
- 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