aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAge
* Merge branch 'jk/rebase-quiet-noop'Junio C Hamano2015-05-11
|\
| * rebase: silence "git checkout" for noop rebaseJeff King2015-04-28
| * Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-25
| |\
* | | *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy2014-12-01
* | | rebase: omit patch-identical commits with --fork-pointJohn Keeping2014-07-16
* | | Merge branch 'rr/rebase-autostash-fix'Junio C Hamano2014-06-16
|\ \ \ | | |/ | |/|
| * | rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-19
* | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-06-03
|\ \ \ | |_|/ |/| |
| * | git-rebase.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-23
* | | Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano2014-04-21
|\ \ \
| * | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"Kyle J. McKay2014-04-17
* | | | Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano2014-03-28
|\ \ \ \ | |_|/ / |/| | |
| * | | rebase: allow "-" short-hand for the previous branchBrian Gesiak2014-03-19
| |/ /
* | | rebase: add the --gpg-sign optionNicolas Vigier2014-02-11
* | | rebase: parse options in stuck-long modeNicolas Vigier2014-02-11
* | | rebase: don't try to match -M optionNicolas Vigier2014-02-03
* | | rebase: remove useless arguments checkNicolas Vigier2014-02-03
* | | git-sh-setup.sh: add variable to use the stuck-long modeNicolas Vigier2014-02-03
|/ /
* | rebase: fix fork-point with zero argumentsJohn Keeping2014-01-09
* | rebase: use reflog to find common base with upstreamJohn Keeping2013-12-10
* | Merge branch 'mm/rebase-continue-freebsd-WB'Junio C Hamano2013-09-20
|\ \
| * | rebase: fix run_specific_rebase's use of "return" on FreeBSDMatthieu Moy2013-09-09
* | | Merge branch 'rr/rebase-autostash'Junio C Hamano2013-07-31
|\ \ \ | | |/ | |/|
| * | git-rebase: fix typoRalf Thielow2013-07-29
* | | Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-18
|\ \ \
| * | | rebase: use a better reflog messageRamkumar Ramachandra2013-06-23
* | | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-27
|\ \ \ \
| * | | | rebase: use 'git stash store' to simplify logicRamkumar Ramachandra2013-06-17
* | | | | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-24
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-14
| |/ / /
* | | | rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-13
* | | | rebase: finish_rebase() in fast-forward rebaseRamkumar Ramachandra2013-06-13
* | | | rebase: guard against missing files in read_basic_state()Ramkumar Ramachandra2013-06-13
|/ / /
* | | rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra2013-05-29
| |/ |/|
* | rebase: prepare to do generic housekeepingRamkumar Ramachandra2013-05-12
|/
* Merge branch 'ph/rebase-original'Junio C Hamano2013-04-26
|\
| * rebase: find orig_head unambiguouslyPhil Hord2013-04-23
* | rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-17
* | rebase usage: subcommands can not be combined with -iMartin von Zweigbergk2012-09-17
|/
* git-rebase.sh: fix typo in an error messageRalf Thielow2012-08-01
* rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin2012-07-26
* i18n: Rewrite gettext messages start with dashJiang Xin2012-07-26
* i18n: rebase: mark messages for translationJiang Xin2012-07-25
* Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-15
|\
| * rebase -i: support --root without --ontoChris Webb2012-06-26
* | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-13
|\ \
| * | rebase --root: print usage on too many argsMartin von Zweigbergk2012-06-26
| |/
* | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-13
|/
* Merge branch 'ef/maint-rebase-error-message'Junio C Hamano2012-06-01
|\
| * rebase: report invalid commit correctlyErik Faye-Lund2012-05-30