summaryrefslogtreecommitdiff
path: root/git-legacy-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2019-02-08Merge branch 'js/rebase-i-redo-exec-fix'Libravatar Junio C Hamano1-6/+0
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Libravatar Junio C Hamano1-35/+30
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Libravatar Johannes Schindelin1-6/+0
2019-02-05Merge branch 'pw/no-editor-in-rebase-i-implicit'Libravatar Junio C Hamano1-2/+2
2019-01-28implicit interactive rebase: don't run sequence editorLibravatar Phillip Wood1-2/+2
2019-01-07rebase: implement --merge via the interactive machineryLibravatar Elijah Newren1-22/+21
2018-12-28git-legacy-rebase: simplify unnecessary triply-nested ifLibravatar Elijah Newren1-12/+8
2018-12-28git-rebase, sequencer: extend --quiet option for the interactive machineryLibravatar Elijah Newren1-1/+1
2018-12-28rebase: fix incompatible options error messageLibravatar Elijah Newren1-2/+2
2018-12-28rebase: make builtin and legacy script error messages the sameLibravatar Elijah Newren1-6/+6
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execLibravatar Johannes Schindelin1-0/+6
2018-12-11rebase: add a config option to default to --reschedule-failed-execLibravatar Johannes Schindelin1-0/+2
2018-12-11rebase: introduce --reschedule-failed-execLibravatar Johannes Schindelin1-1/+15
2018-11-30rebase --stat: fix when rebasing to an unrelated historyLibravatar Johannes Schindelin1-2/+8
2018-11-21legacy-rebase: backport -C<n> and --whitespace=<option> checksLibravatar Johannes Schindelin1-0/+8
2018-11-02Merge branch 'ag/rebase-i-in-c'Libravatar Junio C Hamano1-5/+42
2018-11-02Merge branch 'pk/rebase-in-c'Libravatar Junio C Hamano1-0/+708
2018-08-06rebase: refactor common shell functions into their own fileLibravatar Pratik Karki1-67/+2
2018-08-06rebase: start implementing it as a builtinLibravatar Pratik Karki1-0/+773