Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
* | | | rebase: factor out sub command handling | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+15 | |
* | | | rebase: make -v a tiny bit more verbose | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+16 | |
* | | | rebase: extract am code to new source file | Martin von Zweigbergk | 2011-02-10 | 1 | -29/+2 | |
* | | | rebase: extract merge code to new source file | Martin von Zweigbergk | 2011-02-10 | 1 | -151/+11 | |
* | | | rebase: remove $branch as synonym for $orig_head | Martin von Zweigbergk | 2011-02-10 | 1 | -10/+9 | |
* | | | rebase -i: support --stat | Martin von Zweigbergk | 2011-02-10 | 1 | -7/+7 | |
* | | | rebase: factor out call to pre-rebase hook | Martin von Zweigbergk | 2011-02-10 | 1 | -5/+7 | |
* | | | rebase: factor out clean work tree check | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 | |
| |/ |/| | ||||||
* | | rebase: factor out reference parsing | Martin von Zweigbergk | 2011-02-10 | 1 | -4/+5 | |
* | | rebase: reorder validation steps | Martin von Zweigbergk | 2011-02-10 | 1 | -5/+5 | |
* | | rebase: factor out command line option processing | Martin von Zweigbergk | 2011-02-10 | 1 | -20/+38 | |
* | | rebase: align variable content | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+3 | |
* | | rebase: align variable names | Martin von Zweigbergk | 2011-02-10 | 1 | -16/+16 | |
* | | rebase: stricter check of standalone sub command | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 | |
* | | rebase: act on command line outside parsing loop | Martin von Zweigbergk | 2011-02-10 | 1 | -60/+66 | |
* | | rebase: improve detection of rebase in progress | Martin von Zweigbergk | 2011-02-10 | 1 | -39/+41 | |
* | | rebase: remove unused rebase state 'prev_head' | Martin von Zweigbergk | 2011-02-10 | 1 | -8/+0 | |
* | | rebase: read state outside loop | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 | |
* | | rebase: refactor reading of state | Martin von Zweigbergk | 2011-02-10 | 1 | -30/+23 | |
* | | rebase: clearer names for directory variables | Martin von Zweigbergk | 2011-02-10 | 1 | -70/+71 | |
|/ | ||||||
* | Merge branch 'maint' | Junio C Hamano | 2011-01-27 | 1 | -1/+2 | |
|\ | ||||||
| * | rebase: give a better error message for bogus branch | Jeff King | 2011-01-26 | 1 | -0/+1 | |
| * | rebase: use explicit "--" with checkout | Jeff King | 2011-01-26 | 1 | -1/+1 | |
| * | Merge branch 'mz/rebase-abort-reflog-fix' into maint | Junio C Hamano | 2010-12-14 | 1 | -9/+10 | |
| |\ | ||||||
| * \ | Merge branch 'mz/maint-rebase-stat-config' into maint | Junio C Hamano | 2010-12-14 | 1 | -1/+2 | |
| |\ \ | ||||||
* | \ \ | Merge branch 'mz/rebase-i-verify' | Junio C Hamano | 2010-12-12 | 1 | -0/+3 | |
|\ \ \ \ | ||||||
| * | | | | rebase: support --verify | Martin von Zweigbergk | 2010-11-23 | 1 | -0/+3 | |
| |/ / / | ||||||
* | | | | Merge branch 'mz/rebase-abort-reflog-fix' | Junio C Hamano | 2010-12-12 | 1 | -9/+10 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | rebase --abort: do not update branch ref | Martin von Zweigbergk | 2010-11-23 | 1 | -9/+10 | |
| |/ / | ||||||
* | | | Merge branch 'mz/maint-rebase-stat-config' | Junio C Hamano | 2010-12-12 | 1 | -1/+2 | |
|\ \ \ | | |/ | |/| |