summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsLibravatar Johannes Schindelin1-1/+11
2018-04-26rebase: introduce the --rebase-merges optionLibravatar Johannes Schindelin1-0/+6
2018-04-25Merge branch 'pw/rebase-signoff'Libravatar Junio C Hamano1-1/+26
2018-04-25Merge branch 'pw/rebase-keep-empty-fixes'Libravatar Junio C Hamano1-0/+4
2018-03-29rebase --keep-empty: always use interactive rebaseLibravatar Phillip Wood1-0/+5
2018-03-29rebase -p: error out if --signoff is givenLibravatar Phillip Wood1-0/+2
2018-03-29rebase: extend --signoff supportLibravatar Phillip Wood1-1/+19
2018-03-29rebase: respect --no-keep-emptyLibravatar Phillip Wood1-0/+3
2018-03-23rebase: add and use git_rebase__interactive__preserve_mergesLibravatar Wink Saville1-1/+1
2018-03-23rebase: update invocation of rebase dot-sourced scriptsLibravatar Wink Saville1-0/+1
2018-03-20rebase --root: stop assuming squash_onto is unsetLibravatar Phillip Wood1-0/+1
2018-03-06Merge branch 'nd/rebase-show-current-patch'Libravatar Junio C Hamano1-1/+7
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-02-12rebase: add --show-current-patchLibravatar Nguyễn Thái Ngọc Duy1-1/+6
2018-02-07rebase: add --allow-empty-message optionLibravatar Genki Sky1-0/+5
2017-12-19rebase: rebasing can also be done when HEAD is detachedLibravatar Kaartic Sivaraam1-2/+14
2017-12-19rebase: distinguish user input by quoting itLibravatar Kaartic Sivaraam1-2/+2
2017-12-19rebase: consistently use branch_name variableLibravatar Kaartic Sivaraam1-7/+10
2017-11-27Merge branch 'ks/rebase-no-git-foo'Libravatar Junio C Hamano1-2/+2
2017-11-27Merge branch 'tz/redirect-fix'Libravatar Junio C Hamano1-1/+1
2017-11-21git-rebase: clean up dashed-usages in messagesLibravatar Kaartic Sivaraam1-2/+2
2017-11-14rebase: fix stderr redirect in apply_autostash()Libravatar Todd Zullinger1-1/+1
2017-10-03Merge branch 'bc/rev-parse-parseopt-fix'Libravatar Junio C Hamano1-0/+3
2017-09-19git-rebase: don't ignore unexpected command line argumentsLibravatar Brandon Casey1-0/+3
2017-08-23Merge branch 'kw/rebase-progress'Libravatar Junio C Hamano1-0/+6
2017-08-14rebase: turn on progress option by default for format-patchLibravatar Kevin Willford1-0/+6
2017-07-17rebase: make resolve message clearer for inexperienced usersLibravatar William Duclot1-3/+4
2017-07-10Merge branch 'pw/rebase-i-regression-fix-tests' into maintLibravatar Junio C Hamano1-2/+2
2017-06-30Merge branch 'pw/rebase-i-regression-fix-tests'Libravatar Junio C Hamano1-2/+2
2017-06-19sequencer: print autostash messages to stderrLibravatar Johannes Schindelin1-2/+2
2017-04-26Merge branch 'gb/rebase-signoff'Libravatar Junio C Hamano1-1/+2
2017-04-18rebase: pass --[no-]signoff option to git amLibravatar Giuseppe Bilotta1-1/+2
2016-12-19Merge branch 'nd/rebase-forget'Libravatar Junio C Hamano1-1/+5
2016-12-11rebase: add --quit to cleanup rebase, leave everything else untouchedLibravatar Nguyễn Thái Ngọc Duy1-1/+5
2016-06-17i18n: git-sh-setup.sh: mark strings for translationLibravatar Vasco Almeida1-1/+0
2016-06-17i18n: rebase: mark placeholder for translationLibravatar Vasco Almeida1-1/+1
2016-06-17i18n: rebase: fix marked string to use eval_gettext variantLibravatar Vasco Almeida1-1/+1
2016-05-13Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Libravatar Junio C Hamano1-1/+4
2016-05-03commit-tree: do not pay attention to commit.gpgsignLibravatar Junio C Hamano1-1/+4
2016-03-18rebase: decouple --exec from --interactiveLibravatar Stefan Beller1-6/+1
2016-01-26Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'Libravatar Junio C Hamano1-1/+1
2016-01-13rebase: ignore failures from "gc --auto"Libravatar Jeff King1-1/+1
2015-10-05Merge branch 'jk/rebase-no-autostash'Libravatar Junio C Hamano1-1/+4
2015-09-10rebase: support --no-autostashLibravatar John Keeping1-1/+4
2015-05-26Merge branch 'jk/rebase-quiet-noop' into maintLibravatar Junio C Hamano1-1/+1
2015-05-11Merge branch 'jk/rebase-quiet-noop'Libravatar Junio C Hamano1-1/+1
2015-04-28rebase: silence "git checkout" for noop rebaseLibravatar Jeff King1-1/+1
2014-12-01*.sh: avoid hardcoding $GIT_DIR/hooks/...Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2014-07-16rebase: omit patch-identical commits with --fork-pointLibravatar John Keeping1-3/+4
2014-06-25Merge branch 'rr/rebase-autostash-fix' into maintLibravatar Junio C Hamano1-1/+10