Commit Briefs

Stefan Sperling

show merged commit ID + logmsg upon merge conflict during rebase and histedit

This makes it more apparent which commit contained the conflicting change. The new output looks like this: C sys/dev/pci/if_iwm.c 8a98d848a1a5 -> merge conflict: properly modify station queues got: conflicts must be resolved before rebasing can continue

diff | patch | tree

Stefan Sperling

don't leak logmsg in show_rebase_progress()

diff | patch | tree

Stefan Sperling

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

diff | patch | tree

Stefan Sperling

bump version number

diff | patch | tree

Stefan Sperling

changes for 0.28 (tags/0.28)

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

Christian Weisgerber

Sync the description of the -r flag from "tree" to the other commands.

Clarify that if the current directory is a work tree, tog will pick the repository associated with this work tree by default. ok stsp

diff | patch | tree