summaryrefslogtreecommitdiff
path: root/git-rebase.sh
AgeCommit message (Expand)AuthorFilesLines
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
2012-09-17rebase -i: Teach "--edit-todo" actionLibravatar Andrew Wong1-2/+11
2012-09-17rebase usage: subcommands can not be combined with -iLibravatar Martin von Zweigbergk1-1/+1
2012-08-01git-rebase.sh: fix typo in an error messageLibravatar Ralf Thielow1-1/+1
2012-07-26rebase: remove obsolete and unused LONG_USAGE which breaks xgettextLibravatar Jiang Xin1-25/+0
2012-07-26i18n: Rewrite gettext messages start with dashLibravatar Jiang Xin1-1/+1
2012-07-25i18n: rebase: mark messages for translationLibravatar Jiang Xin1-30/+34
2012-07-15Merge branch 'cw/rebase-i-root'Libravatar Junio C Hamano1-2/+12
2012-07-13Merge branch 'mz/rebase-no-mbox'Libravatar Junio C Hamano1-1/+5
2012-06-26rebase -i: support --root without --ontoLibravatar Chris Webb1-2/+12
2012-06-26rebase --root: print usage on too many argsLibravatar Martin von Zweigbergk1-1/+5
2012-06-13rebase -i: teach "--exec <cmd>"Libravatar Lucien Kong1-3/+17
2012-06-01Merge branch 'ef/maint-rebase-error-message'Libravatar Junio C Hamano1-1/+1
2012-05-30rebase: report invalid commit correctlyLibravatar Erik Faye-Lund1-1/+1
2012-05-29Do not autosquash in case of an implied interactive rebaseLibravatar Vincent van Ravesteijn1-0/+1
2012-04-24git-rebase: add keep_empty flagLibravatar Neil Horman1-0/+5
2012-03-04Make git-{pull,rebase} message without tracking information friendlierLibravatar Carlos Martín Nieto1-1/+1
2011-10-17Merge branch 'jk/pull-rebase-with-work-tree'Libravatar Junio C Hamano1-1/+1
2011-10-13pull,rebase: handle GIT_WORK_TREE betterLibravatar Jeff King1-1/+1
2011-08-05misc-sh: fix up whitespace in some other .sh files.Libravatar Jon Seymour1-1/+1
2011-07-22Merge branch 'mz/doc-rebase-abort'Libravatar Junio C Hamano1-5/+5