Commit Briefs

5aa813935b Stefan Sperling

add copyright year for files already touched in 2020

diff | patch | tree

e51d7b55a3 Stefan Sperling

prevent rebase with an out-of-date work tree

diff | patch | tree

38b0338bf9 Stefan Sperling

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

Problem found by kn@

diff | patch | tree

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

fc66b545cb Stefan Sperling

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

diff | patch | tree

f032f1f7ee Stefan Sperling

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

diff | patch | tree

11495e0417 Stefan Sperling

tweak 'got rebase' conflict error message

diff | patch | tree

4ba9c4f6a0 Stefan Sperling

fix wrong sandbox name used by a rebase test

diff | patch | tree

787c8eb6b2 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

64c6d99023 Stefan Sperling

prevent rebase in a work tree with an incompatible path prefix

diff | patch | tree

7d5807f451 Stefan Sperling

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

diff | patch | tree

dcf44d0428 Stefan Sperling

revert accidental change; run all rebase tests again

diff | patch | tree

ff0d2220eb Stefan Sperling

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

diff | patch | tree

818c750100 Stefan Sperling

initial 'got rebase' implementation

diff | patch | tree