Commit Briefs

Omar Polo

sync usage with reality

The -h and -V/--version flags must be given before the command; with those flags the command is actually optional, but don't over-complicate the usage string with these nitpicks. ok/improvements stsp@


Mark Jamsek

add gotadmin init -b <branch> to specify repo head ref

Similar to `git init -b`. Includes a change to `got import` behaviour such that "main" is no longer hardcoded by default; instead, we import to the branch resolved via the repository's HEAD reference unless `got import -b` is used, and only if HEAD cannot be resolved to a branch do we fallback to "main". includes fix plus ok from stsp@


Stefan Sperling

forbid rebase of references outside the refs/heads/ namespace

ok jrick



Omar Polo

use Xo/Xc in the man pages

Patch by Josiah Frentsos; ok kn@


Stefan Sperling

got(1): Replace 'Ar sign' with 'Cm sign'

Cm sign matches the markup used in the ssh-keygen(1) man page. Patch by Josiah Frentsos


Stefan Sperling

Group options in accordance with style(9)

patch by Josiah Frentsos


Stefan Sperling

rework got patch -c documentation

ok op@


Omar Polo

warn about the interaction between got patch -p and -c

suggested by stsp@


Omar Polo

got patch: add -c flag to apply at a specified commit

it's useful for e.g. to apply old patches that weren't generated by `got diff' or git-diff(1) and so lacks the metadata needed for the 3-way merge. manpage improvements from and ok stsp@





Stefan Sperling

document pull request workflow in got.1 man page

With permission from Jelmer Vernooij to use my pull request config for Dulwich, and Jelmer's name, as a real-life example. ok tracey, jamsek


Omar Polo

got commit: add flag to specify the author

This adds a new flag, `got commit -A', that allows to specify the commit author but retains the "committer" (which is obtained as usual via GOT_AUTHOR, got.conf or git config.) with lots of help from and ok stsp