Commit Briefs

2a47b1e585 Stefan Sperling

provide a diff of changes in a temp file while editing a commit log message

ok landry@


6a0a1bd407 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@


6f04a73d17 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@


442ede73ea Stefan Sperling

forbid rebase of references outside the refs/heads/ namespace

ok jrick


5e91dae4dd Stefan Sperling

remove trailing whitespace; patch by Josiah Frentsos


5fc4f020b7 Omar Polo

use Xo/Xc in the man pages

Patch by Josiah Frentsos; ok kn@


217e00e5c9 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


827a167b34 Stefan Sperling

Group options in accordance with style(9)

patch by Josiah Frentsos


76e495bdc0 Stefan Sperling

rework got patch -c documentation

ok op@


c72da327af Omar Polo

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

suggested by stsp@


5f56d41e1a 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@


3e0f95fc70 Stefan Sperling

add a way to ignore author and remote repository info found in Git config files

ok op@




8978dfde09 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


62b21d332b 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


d42bbff9e9 Stefan Sperling

use Cm mdoc markup for histedit script commands



f1e5aff40c Omar Polo

histedit: make sure mesg is only used after pick or edit

It doesn't really make sense to use mesg after a fold or drop, or after another mesg. it currently "works" as intended, but the behaviour is confusing and not useful, better abort the operation as it's probably not what the user intended. Suggested by and ok stsp@


c5d51f2083 Stefan Sperling

improve documentation of the histedit 'mesg' command

prompted by a question by op@



cc63cb4edd Stefan Sperling

mention additional copyright holders in got(1)



2b16c2bca8 Stefan Sperling

Xr gotweb(8) from got(1)


ad8bd524a9 Stefan Sperling

typo