aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.sh
Commit message (Expand)AuthorAge
* Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"Kyle J. McKay2014-04-17
* 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
* | Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn2012-05-29
* | git-rebase: add keep_empty flagNeil Horman2012-04-24
* | Make git-{pull,rebase} message without tracking information friendlierCarlos Martín Nieto2012-03-04
* | Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano2011-10-17
|\ \
| * | pull,rebase: handle GIT_WORK_TREE betterJeff King2011-10-13
* | | misc-sh: fix up whitespace in some other .sh files.Jon Seymour2011-08-05
* | | Merge branch 'mz/doc-rebase-abort'Junio C Hamano2011-07-22
|\ \ \
| * | | rebase: clarify "restore the original branch"Martin von Zweigbergk2011-07-13
* | | | Merge branch 'js/rebase-typo-branch-squelch-usage'Junio C Hamano2011-07-13
|\ \ \ \ | |/ / / |/| | |
| * | | rebase: do not print lots of usage hints after an obvious error messageJohannes Sixt2011-06-29
* | | | rebase: write a reflog entry when finishingJeff King2011-05-27
* | | | rebase: create HEAD reflog entry when abortingCsaba Henk2011-05-27
|/ / /
* | | rebase: define options in OPTIONS_SPECMartin von Zweigbergk2011-03-04
* | | rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk2011-02-10
* | | rebase -m: remember allow_rerere_autoupdate optionMartin von Zweigbergk2011-02-10
* | | rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-10
* | | rebase: remember verbose optionMartin von Zweigbergk2011-02-10