Commits
- Commit:
5aa813935b6489921083da5ed9459a1cfb8a03e3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add copyright year for files already touched in 2020
- Commit:
e51d7b55a3d7fcd307ad6f65fa793a52a24dd697
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent rebase with an out-of-date work tree
- Commit:
38b0338bf913fd419054488e420e0aea644dcb62
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
if there are no commits to rebase, just forward the rebased branch's reference
Problem found by kn@
- Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show base commit hash and omit filenames in conflict markers
- Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show original file content in conflict markers
- Commit:
fc66b545cb13384f19d6637645eb2a01db32f763
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix behaviour of 'got rebase' with no commits to rebase; with semarie@
- Commit:
f032f1f7ee503b7aa2577cf836c485f96620e772
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix and test interaction of rebase/histedit -c and 'got stage'
- Commit:
11495e04177c42cbbbab8416171bad777b37e5d0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
tweak 'got rebase' conflict error message
- Commit:
4ba9c4f6a07eade0d8b44f9d8e0b2dfa463fdbd2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix wrong sandbox name used by a rebase test
- Commit:
787c8eb6b259591b756da4d79fa8f17a315a3710
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
64c6d99023a672f220d1de2662dfe52300f51ea2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
prevent rebase in a work tree with an incompatible path prefix
- Commit:
7d5807f4517a76c30cd479340f6968ca7eecce0b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
disallow 'got update' and 'got commit' while rebase is in progress
- Commit:
dcf44d04283437bb25b602e26674f867e5b95f13
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
revert accidental change; run all rebase tests again
- Commit:
ff0d2220eb012a3bb8f5e583df7baad033a9397b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle no-op changes during 'got rebase -c'
- Commit:
818c750100809b9b2d2c638d39f1427a66929fce
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
initial 'got rebase' implementation