summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)Author
2012-07-25Merge branch 'cw/rebase-i-root'Junio C Hamano
2012-07-24rebase -i: handle fixup of root commit correctlyChris Webb
2012-07-16Merge branch 'cw/rebase-i-root'Junio C Hamano
2012-07-13Merge branch 'mz/rebase-no-mbox'Junio C Hamano
2012-06-26rebase -i: support --root without --ontoChris Webb
2012-06-26rebase: don't source git-sh-setup twiceMartin von Zweigbergk
2012-06-13rebase -i: teach "--exec <cmd>"Lucien Kong
2012-04-30Merge branch 'nh/empty-rebase'Junio C Hamano
2012-04-24git-rebase: add keep_empty flagNeil Horman
2012-04-23Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano
2012-04-09rebase -i continue: don't skip commits that only change submodulesJohn Keeping
2012-03-20rebase -i: remind that the lines are top-to-bottomJunio C Hamano
2011-12-28Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano
2011-12-17Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano
2011-11-30rebase -i: interrupt rebase when "commit --amend" failed during "reword"Andrew Wong
2011-10-17"rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer
2011-08-26rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano
2011-08-26rebase -i: clean error message for --continue after failed execMatthieu Moy
2011-06-19rebase -i -p: include non-first-parent commits in todo listAndrew Wong
2011-05-27rebase: write a reflog entry when finishingJeff King
2011-05-06Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong
2011-02-25Makefile: do not install sourced rebase scriptsMartin von Zweigbergk
2011-02-10rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk
2011-02-10rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk
2011-02-10rebase: remember verbose optionMartin von Zweigbergk
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk
2011-02-10rebase: factor out sub command handlingMartin von Zweigbergk
2011-02-10rebase: make -v a tiny bit more verboseMartin von Zweigbergk
2011-02-10rebase -i: align variable namesMartin von Zweigbergk
2011-02-10rebase: show consistent conflict resolution hintMartin von Zweigbergk
2011-02-10rebase: factor out call to pre-rebase hookMartin von Zweigbergk
2011-02-10rebase: factor out clean work tree checkMartin von Zweigbergk
2011-02-10rebase: factor out reference parsingMartin von Zweigbergk
2011-02-10rebase: reorder validation stepsMartin von Zweigbergk
2011-02-10rebase -i: remove now unnecessary directory checksMartin von Zweigbergk
2011-02-10rebase: factor out command line option processingMartin von Zweigbergk
2011-02-10rebase: align variable contentMartin von Zweigbergk
2011-02-10rebase: align variable namesMartin von Zweigbergk
2011-02-10rebase: act on command line outside parsing loopMartin von Zweigbergk
2011-01-27Merge branch 'maint'Junio C Hamano
2011-01-27rebase -i: clarify in-editor documentation of "exec"Jonathan Nieder
2011-01-27rebase: use explicit "--" with checkoutJeff King
2010-12-13Merge branch 'mz/rebase-i-verify'Junio C Hamano
2010-11-30Merge branch 'rr/needs-clean-work-tree'Junio C Hamano
2010-11-23rebase: support --verifyMartin von Zweigbergk
2010-11-09rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard
2010-11-09rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra