summaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-211-10/+1
|\
| * Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"km/avoid-non-function-return-in-rebaseKyle J. McKay2014-04-171-10/+1
* | Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano2014-03-281-0/+4
|\ \
| * | rebase: allow "-" short-hand for the previous branchBrian Gesiak2014-03-191-0/+4
| |/
* | rebase: add the --gpg-sign optionNicolas Vigier2014-02-111-0/+11
* | rebase: parse options in stuck-long modeNicolas Vigier2014-02-111-28/+22
* | rebase: don't try to match -M optionNicolas Vigier2014-02-031-1/+1
* | rebase: remove useless arguments checkNicolas Vigier2014-02-031-2/+0
* | git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier2014-02-031-0/+1
|/
* rebase: fix fork-point with zero argumentsJohn Keeping2014-01-091-1/+2
* rebase: use reflog to find common base with upstreamJohn Keeping2013-12-101-0/+19
* Merge branch 'mm/rebase-continue-freebsd-WB'Junio C Hamano2013-09-201-1/+10
|\
| * rebase: fix run_specific_rebase's use of "return" on FreeBSDmm/rebase-continue-freebsd-WBMatthieu Moy2013-09-091-1/+10
* | Merge branch 'rr/rebase-autostash'Junio C Hamano2013-07-311-1/+1
|\ \
| * | git-rebase: fix typorr/rebase-autostashRalf Thielow2013-07-291-1/+1
* | | Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-181-2/+6
|\ \ \
| * | | rebase: use a better reflog messageRamkumar Ramachandra2013-06-231-2/+6
* | | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-271-5/+2
|\ \ \ \
| * | | | rebase: use 'git stash store' to simplify logicRamkumar Ramachandra2013-06-171-5/+2
* | | | | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-241-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-141-2/+2
| |/ / /
* | | | rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-131-0/+1
* | | | rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra2013-06-131-0/+1
* | | | rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra2013-06-131-0/+2
|/ / /
* | | rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-291-3/+42
| |/ |/|
* | rebase: prepare to do generic housekeepingRamkumar Ramachandra2013-05-121-0/+7
|/
* Merge branch 'ph/rebase-original'Junio C Hamano2013-04-261-1/+1
|\
| * rebase: find orig_head unambiguouslyPhil Hord2013-04-231-1/+1
* | rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-171-2/+11
* | rebase usage: subcommands can not be combined with -iMartin von Zweigbergk2012-09-171-1/+1
|/
* git-rebase.sh: fix typo in an error messageRalf Thielow2012-08-011-1/+1
* rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin2012-07-261-25/+0
* i18n: Rewrite gettext messages start with dashJiang Xin2012-07-261-1/+1
* i18n: rebase: mark messages for translationJiang Xin2012-07-251-30/+34
* Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-151-2/+12
|\
| * rebase -i: support --root without --ontoChris Webb2012-06-261-2/+12
* | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-131-1/+5
|\ \
| * | rebase --root: print usage on too many argsMartin von Zweigbergk2012-06-261-1/+5
| |/
* | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-131-3/+17
|/
* Merge branch 'ef/maint-rebase-error-message'Junio C Hamano2012-06-011-1/+1
|\
| * rebase: report invalid commit correctlyErik Faye-Lund2012-05-301-1/+1
* | Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn2012-05-291-0/+1
* | git-rebase: add keep_empty flagNeil Horman2012-04-241-0/+5
* | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-messageCarlos Martín Nieto2012-03-041-1/+1
* | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-171-1/+1
|\ \
| * | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-131-1/+1
* | | misc-sh: fix up whitespace in some other .sh files.Jon Seymour2011-08-051-1/+1
* | | Merge branch 'mz/doc-rebase-abort'Junio C Hamano2011-07-221-5/+5
|\ \ \
| * | | rebase: clarify "restore the original branch"Martin von Zweigbergk2011-07-131-5/+5
* | | | Merge branch 'js/rebase-typo-branch-squelch-usage'Junio C Hamano2011-07-131-2/+1
|\ \ \ \ | |/ / / |/| | |
View Lorry Controller Status