regress/cmdline/rebase.sh


Log

Author Commit Date CI Message
Stefan Sperling a0ea4fc0 2020-02-28T17:37:53 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
Stefan Sperling da76fce2 2020-02-24T20:31:09 let 'got branch' switch and update the work tree ok tracey
Stefan Sperling 1ae0a341 2020-02-14T15:43:03 add a test which ensures that 'got rebase' trims empty dirs from disk
Stefan Sperling 5aa81393 2020-01-06T19:38:23 add copyright year for files already touched in 2020
Stefan Sperling e51d7b55 2020-01-04T08:35:17 prevent rebase with an out-of-date work tree
Stefan Sperling 38b0338b 2019-11-29T03:57:10 if there are no commits to rebase, just forward the rebased branch's reference Problem found by kn@
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