Commit Briefs

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

Stefan Sperling

revert accidental change; run all rebase tests again

diff | patch | tree

Stefan Sperling

handle no-op changes during 'got rebase -c'

diff | patch | tree

Stefan Sperling

initial 'got rebase' implementation

diff | patch | tree