aboutsummaryrefslogtreecommitdiffstats
path: root/git-rebase.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2018-08-06rebase: start implementing it as a builtinPratik Karki1-773/+0
2018-07-24Merge branch 'en/rebase-consistency'Junio C Hamano1-4/+39
2018-07-18Merge branch 'en/rebase-i-microfixes'Junio C Hamano1-1/+1
2018-06-27Fix use of strategy options with interactive rebasesElijah Newren1-1/+1
2018-06-27git-rebase: make --allow-empty-message the defaultElijah Newren1-1/+1
2018-06-27git-rebase: error out when incompatible options passedElijah Newren1-0/+35
2018-06-26git-rebase.sh: update help messages a bitElijah Newren1-3/+3
2018-06-01rebase: use the new git-rebase--preserve-merges.shAlban Gruin1-7/+25
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin1-1/+11
2018-04-26rebase: introduce the --rebase-merges optionJohannes Schindelin1-0/+6
2018-04-25Merge branch 'pw/rebase-signoff'Junio C Hamano1-1/+26
2018-04-25Merge branch 'pw/rebase-keep-empty-fixes'Junio C Hamano1-0/+4
2018-03-29rebase --keep-empty: always use interactive rebasePhillip Wood1-0/+5
2018-03-29rebase -p: error out if --signoff is givenPhillip Wood1-0/+2
2018-03-29rebase: extend --signoff supportPhillip Wood1-1/+19
2018-03-29rebase: respect --no-keep-emptyPhillip Wood1-0/+3
2018-03-23rebase: add and use git_rebase__interactive__preserve_mergesWink Saville1-1/+1
2018-03-23rebase: update invocation of rebase dot-sourced scriptsWink Saville1-0/+1
2018-03-20rebase --root: stop assuming squash_onto is unsetPhillip Wood1-0/+1
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano1-1/+7
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy1-0/+1
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy1-1/+6
2018-02-07rebase: add --allow-empty-message optionGenki Sky1-0/+5
2017-12-19rebase: rebasing can also be done when HEAD is detachedKaartic Sivaraam1-2/+14
2017-12-19rebase: distinguish user input by quoting itKaartic Sivaraam1-2/+2
2017-12-19rebase: consistently use branch_name variableKaartic Sivaraam1-7/+10
2017-11-27Merge branch 'ks/rebase-no-git-foo'Junio C Hamano1-2/+2
2017-11-27Merge branch 'tz/redirect-fix'Junio C Hamano1-1/+1
2017-11-21git-rebase: clean up dashed-usages in messagesKaartic Sivaraam1-2/+2
2017-11-14rebase: fix stderr redirect in apply_autostash()Todd Zullinger1-1/+1
2017-10-03Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano1-0/+3
2017-09-19git-rebase: don't ignore unexpected command line argumentsBrandon Casey1-0/+3
2017-08-23Merge branch 'kw/rebase-progress'Junio C Hamano1-0/+6
2017-08-14rebase: turn on progress option by default for format-patchKevin Willford1-0/+6
2017-07-17rebase: make resolve message clearer for inexperienced usersWilliam Duclot1-3/+4
2017-07-10Merge branch 'pw/rebase-i-regression-fix-tests' into maintJunio C Hamano1-2/+2
2017-06-30Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano1-2/+2
2017-06-19sequencer: print autostash messages to stderrJohannes Schindelin1-2/+2
2017-04-26Merge branch 'gb/rebase-signoff'Junio C Hamano1-1/+2
2017-04-18rebase: pass --[no-]signoff option to git amGiuseppe Bilotta1-1/+2
2016-12-19Merge branch 'nd/rebase-forget'Junio C Hamano1-1/+5
2016-12-11rebase: add --quit to cleanup rebase, leave everything else untouchedNguyễn Thái Ngọc Duy1-1/+5
2016-06-17i18n: git-sh-setup.sh: mark strings for translationVasco Almeida1-1/+0
2016-06-17i18n: rebase: mark placeholder for translationVasco Almeida1-1/+1
2016-06-17i18n: rebase: fix marked string to use eval_gettext variantVasco Almeida1-1/+1
2016-05-13Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano1-1/+4
2016-05-03commit-tree: do not pay attention to commit.gpgsignJunio C Hamano1-1/+4
2016-03-18rebase: decouple --exec from --interactiveStefan Beller1-6/+1
2016-01-26Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'Junio C Hamano1-1/+1
2016-01-13rebase: ignore failures from "gc --auto"Jeff King1-1/+1