| Commit message (Expand) | Author | Age | Files | Lines |
* | rebase: fix fork-point with zero arguments | John Keeping | 2014-01-09 | 1 | -1/+2 |
* | rebase: use reflog to find common base with upstream | John Keeping | 2013-12-10 | 1 | -0/+19 |
* | Merge branch 'mm/rebase-continue-freebsd-WB' | Junio C Hamano | 2013-09-20 | 1 | -1/+10 |
|\ |
|
| * | rebase: fix run_specific_rebase's use of "return" on FreeBSDmm/rebase-continue-freebsd-WB | Matthieu Moy | 2013-09-09 | 1 | -1/+10 |
* | | Merge branch 'rr/rebase-autostash' | Junio C Hamano | 2013-07-31 | 1 | -1/+1 |
|\ \ |
|
| * | | git-rebase: fix typorr/rebase-autostash | Ralf Thielow | 2013-07-29 | 1 | -1/+1 |
* | | | Merge branch 'rr/rebase-reflog-message-reword' | Junio C Hamano | 2013-07-18 | 1 | -2/+6 |
|\ \ \ |
|
| * | | | rebase: use a better reflog message | Ramkumar Ramachandra | 2013-06-23 | 1 | -2/+6 |
* | | | | Merge branch 'rr/rebase-stash-store' | Junio C Hamano | 2013-06-27 | 1 | -5/+2 |
|\ \ \ \ |
|
| * | | | | rebase: use 'git stash store' to simplify logic | Ramkumar Ramachandra | 2013-06-17 | 1 | -5/+2 |
* | | | | | Merge branch 'rr/rebase-sha1-by-string-query' | Junio C Hamano | 2013-06-24 | 1 | -2/+2 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | rebase: use peel_committish() where appropriate | Ramkumar Ramachandra | 2013-06-14 | 1 | -2/+2 |
| |/ / / |
|
* | | | | rebase: finish_rebase() in noop rebase | Ramkumar Ramachandra | 2013-06-13 | 1 | -0/+1 |
* | | | | rebase: finish_rebase() in fast-forward rebase | Ramkumar Ramachandra | 2013-06-13 | 1 | -0/+1 |
* | | | | rebase: guard against missing files in read_basic_state() | Ramkumar Ramachandra | 2013-06-13 | 1 | -0/+2 |
|/ / / |
|
* | | | rebase: implement --[no-]autostash and rebase.autostash | Ramkumar Ramachandra | 2013-05-29 | 1 | -3/+42 |
| |/
|/| |
|
* | | rebase: prepare to do generic housekeeping | Ramkumar Ramachandra | 2013-05-12 | 1 | -0/+7 |
|/ |
|
* | Merge branch 'ph/rebase-original' | Junio C Hamano | 2013-04-26 | 1 | -1/+1 |
|\ |
|
| * | rebase: find orig_head unambiguously | Phil Hord | 2013-04-23 | 1 | -1/+1 |
* | | rebase -i: Teach "--edit-todo" action | Andrew Wong | 2012-09-17 | 1 | -2/+11 |
* | | rebase usage: subcommands can not be combined with -i | Martin von Zweigbergk | 2012-09-17 | 1 | -1/+1 |
|/ |
|
* | git-rebase.sh: fix typo in an error message | Ralf Thielow | 2012-08-01 | 1 | -1/+1 |
* | rebase: remove obsolete and unused LONG_USAGE which breaks xgettext | Jiang Xin | 2012-07-26 | 1 | -25/+0 |
* | i18n: Rewrite gettext messages start with dash | Jiang Xin | 2012-07-26 | 1 | -1/+1 |
* | i18n: rebase: mark messages for translation | Jiang Xin | 2012-07-25 | 1 | -30/+34 |
* | Merge branch 'cw/rebase-i-root' | Junio C Hamano | 2012-07-15 | 1 | -2/+12 |
|\ |
|
| * | rebase -i: support --root without --onto | Chris Webb | 2012-06-26 | 1 | -2/+12 |
* | | Merge branch 'mz/rebase-no-mbox' | Junio C Hamano | 2012-07-13 | 1 | -1/+5 |
|\ \ |
|
| * | | rebase --root: print usage on too many args | Martin von Zweigbergk | 2012-06-26 | 1 | -1/+5 |
| |/ |
|
* | | rebase -i: teach "--exec <cmd>" | Lucien Kong | 2012-06-13 | 1 | -3/+17 |
|/ |
|
* | Merge branch 'ef/maint-rebase-error-message' | Junio C Hamano | 2012-06-01 | 1 | -1/+1 |
|\ |
|
| * | rebase: report invalid commit correctly | Erik Faye-Lund | 2012-05-30 | 1 | -1/+1 |
* | | Do not autosquash in case of an implied interactive rebase | Vincent van Ravesteijn | 2012-05-29 | 1 | -0/+1 |
* | | git-rebase: add keep_empty flag | Neil Horman | 2012-04-24 | 1 | -0/+5 |
* | | Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-message | Carlos MartÃn Nieto | 2012-03-04 | 1 | -1/+1 |
* | | Merge branch 'jk/pull-rebase-with-work-tree' | Junio C Hamano | 2011-10-17 | 1 | -1/+1 |
|\ \ |
|
| * | | pull,rebase: handle GIT_WORK_TREE better | Jeff King | 2011-10-13 | 1 | -1/+1 |
* | | | misc-sh: fix up whitespace in some other .sh files. | Jon Seymour | 2011-08-05 | 1 | -1/+1 |
* | | | Merge branch 'mz/doc-rebase-abort' | Junio C Hamano | 2011-07-22 | 1 | -5/+5 |
|\ \ \ |
|
| * | | | rebase: clarify "restore the original branch" | Martin von Zweigbergk | 2011-07-13 | 1 | -5/+5 |
* | | | | Merge branch 'js/rebase-typo-branch-squelch-usage' | Junio C Hamano | 2011-07-13 | 1 | -2/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | rebase: do not print lots of usage hints after an obvious error message | Johannes Sixt | 2011-06-29 | 1 | -2/+1 |
* | | | | rebase: write a reflog entry when finishing | Jeff King | 2011-05-27 | 1 | -1/+3 |
* | | | | rebase: create HEAD reflog entry when aborting | Csaba Henk | 2011-05-27 | 1 | -1/+1 |
|/ / / |
|
* | | | rebase: define options in OPTIONS_SPEC | Martin von Zweigbergk | 2011-03-04 | 1 | -45/+56 |
* | | | rebase: use @{upstream} if no upstream specified | Martin von Zweigbergk | 2011-02-10 | 1 | -6/+15 |
* | | | rebase -m: remember allow_rerere_autoupdate option | Martin von Zweigbergk | 2011-02-10 | 1 | -0/+4 |
* | | | rebase: remember strategy and strategy options | Martin von Zweigbergk | 2011-02-10 | 1 | -0/+6 |
* | | | rebase: remember verbose option | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+4 |
* | | | rebase: extract code for writing basic state | Martin von Zweigbergk | 2011-02-10 | 1 | -3/+13 |