summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-171-40/+44
|\
| * rebase -i: respect core.commentcharJohn Keeping2013-02-121-40/+44
* | Merge branch 'ph/rebase-preserve-all-merges'Junio C Hamano2013-01-211-1/+6
|\ \ | |/ |/|
| * rebase --preserve-merges: keep all merge commits including empty onesPhil Hord2013-01-141-1/+6
* | Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-291-13/+40
|\ \
| * | rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt2012-09-191-2/+3
| * | rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-171-0/+17
| * | rebase -i: Refactor help messages for todo fileAndrew Wong2012-09-171-11/+20
| * | Merge branch 'mg/rebase-i-onto-reflog-in-full'Junio C Hamano2012-08-291-2/+1
| |\ \
* | | | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-181-0/+4
* | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-101-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano2012-09-101-2/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * rebase -i: use full onto sha1 in reflogMichael J Gruber2012-08-101-2/+1
| | * Merge branch 'nl/rebase-i-cheat-sheet' into maintJunio C Hamano2012-05-101-0/+2
| | |\
* | | \ Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-251-12/+13
|\ \ \ \
| * | | | rebase -i: handle fixup of root commit correctlyChris Webb2012-07-241-12/+13
* | | | | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-151-6/+26
|\ \ \ \ \ | |/ / / /
| * | | | rebase -i: support --root without --ontoChris Webb2012-06-261-6/+26
| |/ / /
* | | | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-131-3/+1
|\ \ \ \
| * | | | rebase: don't source git-sh-setup twiceMartin von Zweigbergk2012-06-261-3/+1
| |/ / /
* | | | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-131-0/+23
|/ / /
* | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-301-3/+32
|\ \ \
| * | | git-rebase: add keep_empty flagNeil Horman2012-04-241-3/+32
* | | | Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano2012-04-231-1/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-091-1/+1
| * | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano2011-12-281-13/+23
| |\ \
* | | | rebase -i: remind that the lines are top-to-bottomnl/rebase-i-cheat-sheetJunio C Hamano2012-03-201-0/+2
| |_|/ |/| |
* | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano2011-12-161-13/+23
|\ \ \ | |/ / |/| / | |/
| * rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amendAndrew Wong2011-11-301-13/+23
* | "rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer2011-10-171-1/+14
|/
* rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano2011-08-261-3/+9
* rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-261-1/+17
* rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-191-2/+1
* rebase: write a reflog entry when finishingJeff King2011-05-271-1/+3
* Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano2011-05-061-1/+1
|\
| * git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-281-1/+1
* | Makefile: do not install sourced rebase scriptsMartin von Zweigbergk2011-02-251-0/+0
* | rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk2011-02-101-19/+0
* | rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk2011-02-101-1/+0
* | rebase: remember strategy and strategy optionsMartin von Zweigbergk2011-02-101-2/+0
* | rebase: remember verbose optionMartin von Zweigbergk2011-02-101-2/+0
* | rebase: extract code for writing basic stateMartin von Zweigbergk2011-02-101-4/+1
* | rebase: factor out sub command handlingMartin von Zweigbergk2011-02-101-31/+3
* | rebase: make -v a tiny bit more verboseMartin von Zweigbergk2011-02-101-14/+0
* | rebase -i: align variable namesMartin von Zweigbergk2011-02-101-61/+59
* | rebase: show consistent conflict resolution hintMartin von Zweigbergk2011-02-101-3/+1
* | rebase: factor out call to pre-rebase hookMartin von Zweigbergk2011-02-101-14/+0
* | rebase: factor out clean work tree checkMartin von Zweigbergk2011-02-101-2/+0
* | rebase: factor out reference parsingMartin von Zweigbergk2011-02-101-44/+4
* | rebase: reorder validation stepsMartin von Zweigbergk2011-02-101-2/+2
View Lorry Controller Status