| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'nh/empty-rebase' | Junio C Hamano | 2012-04-30 | 1 | -3/+32 |
|\ |
|
| * | git-rebase: add keep_empty flag | Neil Horman | 2012-04-24 | 1 | -3/+32 |
* | | Merge branch 'jk/rebase-i-submodule-conflict-only' | Junio C Hamano | 2012-04-23 | 1 | -1/+1 |
|\ \ |
|
| * | | rebase -i continue: don't skip commits that only change submodules | John Keeping | 2012-04-09 | 1 | -1/+1 |
| * | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint | Junio C Hamano | 2011-12-28 | 1 | -13/+23 |
| |\ \ |
|
* | | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheet | Junio C Hamano | 2012-03-20 | 1 | -0/+2 |
| |_|/
|/| | |
|
* | | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' | Junio C Hamano | 2011-12-16 | 1 | -13/+23 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amend | Andrew Wong | 2011-11-30 | 1 | -13/+23 |
* | | "rebase -i": support special-purpose editor to edit insn sheet | Peter Oberndorfer | 2011-10-17 | 1 | -1/+14 |
|/ |
|
* | rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree | Junio C Hamano | 2011-08-26 | 1 | -3/+9 |
* | rebase -i: clean error message for --continue after failed exec | Matthieu Moy | 2011-08-26 | 1 | -1/+17 |
* | rebase -i -p: include non-first-parent commits in todo list | Andrew Wong | 2011-06-19 | 1 | -2/+1 |
* | rebase: write a reflog entry when finishing | Jeff King | 2011-05-27 | 1 | -1/+3 |
* | Merge branch 'aw/maint-rebase-i-p-no-ff' | Junio C Hamano | 2011-05-06 | 1 | -1/+1 |
|\ |
|
| * | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff | Andrew Wong | 2011-04-28 | 1 | -1/+1 |
* | | Makefile: do not install sourced rebase scripts | Martin von Zweigbergk | 2011-02-25 | 1 | -0/+0 |
* | | rebase -i: remove unnecessary state rebase-root | Martin von Zweigbergk | 2011-02-10 | 1 | -19/+0 |
* | | rebase -i: don't read unused variable preserve_merges | Martin von Zweigbergk | 2011-02-10 | 1 | -1/+0 |
* | | rebase: remember strategy and strategy options | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+0 |
* | | rebase: remember verbose option | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+0 |
* | | rebase: extract code for writing basic state | Martin von Zweigbergk | 2011-02-10 | 1 | -4/+1 |
* | | rebase: factor out sub command handling | Martin von Zweigbergk | 2011-02-10 | 1 | -31/+3 |
* | | rebase: make -v a tiny bit more verbose | Martin von Zweigbergk | 2011-02-10 | 1 | -14/+0 |
* | | rebase -i: align variable names | Martin von Zweigbergk | 2011-02-10 | 1 | -61/+59 |
* | | rebase: show consistent conflict resolution hint | Martin von Zweigbergk | 2011-02-10 | 1 | -3/+1 |
* | | rebase: factor out call to pre-rebase hook | Martin von Zweigbergk | 2011-02-10 | 1 | -14/+0 |
* | | rebase: factor out clean work tree check | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+0 |
* | | rebase: factor out reference parsing | Martin von Zweigbergk | 2011-02-10 | 1 | -44/+4 |
* | | rebase: reorder validation steps | Martin von Zweigbergk | 2011-02-10 | 1 | -2/+2 |
* | | rebase -i: remove now unnecessary directory checks | Martin von Zweigbergk | 2011-02-10 | 1 | -6/+0 |
* | | rebase: factor out command line option processing | Martin von Zweigbergk | 2011-02-10 | 1 | -162/+62 |
* | | rebase: align variable content | Martin von Zweigbergk | 2011-02-10 | 1 | -5/+11 |
* | | rebase: align variable names | Martin von Zweigbergk | 2011-02-10 | 1 | -240/+240 |
* | | rebase: act on command line outside parsing loop | Martin von Zweigbergk | 2011-02-10 | 1 | -149/+151 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2011-01-27 | 1 | -2/+2 |
|\ |
|
| * | rebase -i: clarify in-editor documentation of "exec"ko-maint | Jonathan Nieder | 2011-01-27 | 1 | -1/+1 |
| * | rebase: use explicit "--" with checkout | Jeff King | 2011-01-26 | 1 | -1/+1 |
* | | Merge branch 'mz/rebase-i-verify' | Junio C Hamano | 2010-12-12 | 1 | -0/+2 |
|\ \ |
|
| * | | rebase: support --verify | Martin von Zweigbergk | 2010-11-23 | 1 | -0/+2 |
| |/ |
|
* | | Merge branch 'rr/needs-clean-work-tree' | Junio C Hamano | 2010-11-29 | 1 | -11/+3 |
|\ \ |
|
| * | | Porcelain scripts: Rewrite cryptic "needs update" error message | Ramkumar Ramachandra | 2010-10-28 | 1 | -11/+3 |
| |/ |
|
* | | rebase: teach --autosquash to match on sha1 in addition to message | Kevin Ballard | 2010-11-09 | 1 | -7/+33 |
* | | rebase: better rearranging of fixup!/squash! lines with --autosquash | Kevin Ballard | 2010-11-09 | 1 | -0/+4 |
|/ |
|
* | git-rebase--interactive.sh: replace cut with ${v%% *} | Chris Johnsen | 2010-09-17 | 1 | -1/+1 |
* | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-08-31 | 1 | -3/+3 |
|\ |
|
| * | cherry-pick/revert: Use advise() for hints | Jonathan Nieder | 2010-08-15 | 1 | -3/+3 |
* | | Merge branch 'hv/autosquash-config' | Junio C Hamano | 2010-08-31 | 1 | -0/+4 |
|\ \ |
|
| * | | add configuration variable for --autosquash option of interactive rebase | Heiko Voigt | 2010-07-14 | 1 | -0/+4 |
* | | | Merge branch 'mm/rebase-i-exec' | Junio C Hamano | 2010-08-21 | 1 | -6/+43 |
|\ \ \ |
|
| * | | | git-rebase--interactive.sh: use printf instead of echo to print commit message | Brandon Casey | 2010-08-13 | 1 | -2/+2 |