aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAge
* Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-10
|\
| * Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano2012-09-10
| |\
| | * rebase -i: use full onto sha1 in reflogMichael J Gruber2012-08-10
| | * Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano2012-05-10
| | |\
* | | \ Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-25
|\ \ \ \
| * | | | rebase -i: handle fixup of root commit correctlyChris Webb2012-07-24
* | | | | 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: don't source git-sh-setup twiceMartin von Zweigbergk2012-06-26
| |/ / /
* | | | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-13
|/ / /
* | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-30
|\ \ \
| * | | git-rebase: add keep_empty flagNeil Horman2012-04-24
* | | | Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano2012-04-23
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-09
| * | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano2011-12-28
| |\ \
* | | | rebase -i: remind that the lines are top-to-bottomJunio C Hamano2012-03-20
| |_|/ |/| |
* | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano2011-12-16
|\ \ \ | |/ / |/| / | |/
| * rebase -i: interrupt rebase when "commit --amend" failed during "reword"Andrew Wong2011-11-30
* | "rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer2011-10-17
|/
* rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano2011-08-26
* rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-26
* rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-19
* rebase: write a reflog entry when finishingJeff King2011-05-27
* Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano2011-05-06
|\
| * git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-28
* | Makefile: do not install sourced rebase scriptsMartin von Zweigbergk2011-02-25
* | rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk2011-02-10
* | rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk2011-02-10
* | rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-10
* | rebase: remember verbose optionMartin von Zweigbergk2011-02-10
* | rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-10
* | rebase: factor out sub command handlingMartin von Zweigbergk2011-02-10
* | rebase: make -v a tiny bit more verboseMartin von Zweigbergk2011-02-10
* | rebase -i: align variable namesMartin von Zweigbergk2011-02-10
* | rebase: show consistent conflict resolution hintMartin von Zweigbergk2011-02-10
* | rebase: factor out call to pre-rebase hookMartin von Zweigbergk2011-02-10
* | rebase: factor out clean work tree checkMartin von Zweigbergk2011-02-10
* | rebase: factor out reference parsingMartin von Zweigbergk2011-02-10
* | rebase: reorder validation stepsMartin von Zweigbergk2011-02-10
* | rebase -i: remove now unnecessary directory checksMartin von Zweigbergk2011-02-10
* | rebase: factor out command line option processingMartin von Zweigbergk2011-02-10
* | rebase: align variable contentMartin von Zweigbergk2011-02-10
* | rebase: align variable namesMartin von Zweigbergk2011-02-10
* | rebase: act on command line outside parsing loopMartin von Zweigbergk2011-02-10
|/
* Merge branch 'maint'Junio C Hamano2011-01-27
|\
| * rebase -i: clarify in-editor documentation of "exec"Jonathan Nieder2011-01-27
| * rebase: use explicit "--" with checkoutJeff King2011-01-26
* | Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-12
|\ \
| * | rebase: support --verifyMartin von Zweigbergk2010-11-23
| |/