Commit Briefs

Stefan Sperling

add ori as author

diff | patch | tree

Stefan Sperling

prevent commits from being listed more than once in a histedit script

While merging a commit multiple times during a histedit operation could potentially make sense in some corner case, a commit appearing more than once in the script is more likely to happen accidentally. If desired, the same effect can still be achieved by running multiple histedit operations, or by using 'got cherrypick' while the histedit operation is paused for arbitrary editing.

diff | patch | tree

Stefan Sperling

be helpful when users try to check out work trees without a known branch

Provide a useful error message in such cases and explicitly document intentional restrictions in the got(1) man page. Prompted by a question from Adam Steen via bsd.network https://bsd.network/@adams/103768951483318235

diff | patch | tree

Stefan Sperling

in got.1, clarify that rebasing of branches with zero local changes is normal

diff | patch | tree

Stefan Sperling

attempt to more clearly explain what 'got rebase' is used for

diff | patch | tree

Stefan Sperling

disallow 'got rebase' while a histedit operation is in progress

diff | patch | tree

Stefan Sperling

document that 'got integrate' cannot be used during a histedit operation

diff | patch | tree

Stefan Sperling

document histedit's -F option

diff | patch | tree

Stefan Sperling

explain more clearly how a histedit script will be edited

diff | patch | tree

Stefan Sperling

document more clearly what needs to be done to start a histedit operation

diff | patch | tree

Stefan Sperling

switch 'got tag' commit argument to a -c option for consistency

diff | patch | tree

Stefan Sperling

let 'got branch' switch and update the work tree

ok tracey

diff | patch | tree

Tracey Emery

edit man page wording for histedit -m feature

diff | patch | tree

Stefan Sperling

add 'got histedit -m' option which makes it easy to edit log messages only

ok tracey

diff | patch | tree

Stefan Sperling

show how to log subdirectories in got.1 EXAMPLES

ok naddy

diff | patch | tree

Stefan Sperling

document semantics of got log and tog log path arguments

diff | patch | tree

Stefan Sperling

better description of the effects of 'got rebase' in got.1 EXAMPLES

diff | patch | tree

Stefan Sperling

man page wording tweaks

diff | patch | tree

Stefan Sperling

make 'got log' show first-parent history by default; remove -f and add -b option

diff | patch | tree

Stefan Sperling

fix typo in got(1) man page markup

diff | patch | tree

Stefan Sperling

make got and tog accept a --version argument; -V option is a bit obscure

prompted by a question from tedu@

diff | patch | tree

Stefan Sperling

add -E option to 'got checkout' allowing use of a non-empty work tree path

needed by and ok kn@

diff | patch | tree

Stefan Sperling

add copyright year for files already touched in 2020

diff | patch | tree

Stefan Sperling

explicitly document that rebase requires a work tree reflecting a branch tip

diff | patch | tree

Stefan Sperling

both 'got add' and 'got rm' now accept directories; sync usage and man pages

diff | patch | tree