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

let 'got branch' switch and update the work tree

ok tracey

diff | patch | tree

Stefan Sperling

add a test which ensures that 'got rebase' trims empty dirs from disk

diff | patch | tree

Stefan Sperling

add copyright year for files already touched in 2020

diff | patch | tree

Stefan Sperling

prevent rebase with an out-of-date work tree

diff | patch | tree

Stefan Sperling

if there are no commits to rebase, just forward the rebased branch's reference

Problem found by kn@

diff | patch | tree

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

show original file content in conflict markers

diff | patch | tree

Stefan Sperling

fix behaviour of 'got rebase' with no commits to rebase; with semarie@

diff | patch | tree

Stefan Sperling

fix and test interaction of rebase/histedit -c and 'got stage'

diff | patch | tree

Stefan Sperling

tweak 'got rebase' conflict error message

diff | patch | tree

Stefan Sperling

fix wrong sandbox name used by a rebase test

diff | patch | tree

Stefan Sperling

fix extra whitespace in rebased log messages

Trim leading and trailing whitespace from log messages when creating commits. Fixes a rebase issue but should be a good idea in general.

diff | patch | tree

Stefan Sperling

prevent rebase in a work tree with an incompatible path prefix

diff | patch | tree

Stefan Sperling

disallow 'got update' and 'got commit' while rebase is in progress

diff | patch | tree