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

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@

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@

forbid rebase of references outside the refs/heads/ namespace ok jrick

remove trailing whitespace; patch by Josiah Frentsos

use Xo/Xc in the man pages Patch by Josiah Frentsos; ok kn@

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

Group options in accordance with style(9) patch by Josiah Frentsos

rework got patch -c documentation ok op@

warn about the interaction between got patch -p and -c suggested by stsp@

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@

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

make mandoc -T lint got.1 happier; pointed out by Mark Jamsek

document use of GOT_AUTHOR by 'got rebase' and 'got histedit'

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