regress/cmdline/rebase.sh


Log

Author Commit Date CI Message
Stefan Sperling f69721c3 2019-10-21T09:04:57 show base commit hash and omit filenames in conflict markers
Stefan Sperling d136cfcb 2019-10-12T07:33:12 show original file content in conflict markers
Stefan Sperling fc66b545 2019-08-12T14:45:02 fix behaviour of 'got rebase' with no commits to rebase; with semarie@
Stefan Sperling f032f1f7 2019-08-04T14:10:07 fix and test interaction of rebase/histedit -c and 'got stage'
Stefan Sperling 11495e04 2019-07-12T20:12:06 tweak 'got rebase' conflict error message
Stefan Sperling 4ba9c4f6 2019-07-11T22:43:29 fix wrong sandbox name used by a rebase test
Stefan Sperling 787c8eb6 2019-07-11T22:40:44 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.
Stefan Sperling 64c6d990 2019-07-11T16:37:36 prevent rebase in a work tree with an incompatible path prefix
Stefan Sperling 7d5807f4 2019-07-11T14:57:24 disallow 'got update' and 'got commit' while rebase is in progress
Stefan Sperling dcf44d04 2019-07-11T14:45:25 revert accidental change; run all rebase tests again
Stefan Sperling ff0d2220 2019-07-11T13:59:20 handle no-op changes during 'got rebase -c'
Stefan Sperling 818c7501 2019-07-10T18:23:39 initial 'got rebase' implementation