summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
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
2014-06-16Merge branch 'rr/rebase-autostash-fix'Libravatar Junio C Hamano1-1/+10
2014-06-03Merge branch 'ep/shell-command-substitution'Libravatar Junio C Hamano1-4/+4
2014-05-19rebase -i: handle "Nothing to do" case with autostashLibravatar Ramkumar Ramachandra1-1/+10
2014-04-23git-rebase.sh: use the $( ... ) construct for command substitutionLibravatar Elia Pinto1-4/+4
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Libravatar Junio C Hamano1-10/+1
2014-04-17Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"Libravatar Kyle J. McKay1-10/+1
2014-03-28Merge branch 'bg/rebase-off-of-previous-branch'Libravatar Junio C Hamano1-0/+4
2014-03-19rebase: allow "-" short-hand for the previous branchLibravatar Brian Gesiak1-0/+4
2014-02-11rebase: add the --gpg-sign optionLibravatar Nicolas Vigier1-0/+11
2014-02-11rebase: parse options in stuck-long modeLibravatar Nicolas Vigier1-28/+22
2014-02-03rebase: don't try to match -M optionLibravatar Nicolas Vigier1-1/+1
2014-02-03rebase: remove useless arguments checkLibravatar Nicolas Vigier1-2/+0
2014-02-03git-sh-setup.sh: add variable to use the stuck-long modeLibravatar Nicolas Vigier1-0/+1
2014-01-09rebase: fix fork-point with zero argumentsLibravatar John Keeping1-1/+2
2013-12-10rebase: use reflog to find common base with upstreamLibravatar John Keeping1-0/+19
2013-09-20Merge branch 'mm/rebase-continue-freebsd-WB'Libravatar Junio C Hamano1-1/+10
2013-09-09rebase: fix run_specific_rebase's use of "return" on FreeBSDLibravatar Matthieu Moy1-1/+10
2013-07-31Merge branch 'rr/rebase-autostash'Libravatar Junio C Hamano1-1/+1
2013-07-29git-rebase: fix typoLibravatar Ralf Thielow1-1/+1
2013-07-18Merge branch 'rr/rebase-reflog-message-reword'Libravatar Junio C Hamano1-2/+6
2013-06-27Merge branch 'rr/rebase-stash-store'Libravatar Junio C Hamano1-5/+2
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Libravatar Junio C Hamano1-2/+2
2013-06-23rebase: use a better reflog messageLibravatar Ramkumar Ramachandra1-2/+6
2013-06-17rebase: use 'git stash store' to simplify logicLibravatar Ramkumar Ramachandra1-5/+2
2013-06-14rebase: use peel_committish() where appropriateLibravatar Ramkumar Ramachandra1-2/+2
2013-06-13rebase: finish_rebase() in noop rebaseLibravatar Ramkumar Ramachandra1-0/+1
2013-06-13rebase: finish_rebase() in fast-forward rebaseLibravatar Ramkumar Ramachandra1-0/+1
2013-06-13rebase: guard against missing files in read_basic_state()Libravatar Ramkumar Ramachandra1-0/+2
2013-05-29rebase: implement --[no-]autostash and rebase.autostashLibravatar Ramkumar Ramachandra1-3/+42
2013-05-12rebase: prepare to do generic housekeepingLibravatar Ramkumar Ramachandra1-0/+7
2013-04-26Merge branch 'ph/rebase-original'Libravatar Junio C Hamano1-1/+1
2013-04-23rebase: find orig_head unambiguouslyLibravatar Phil Hord1-1/+1