summaryrefslogtreecommitdiffstats
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorLines
2011-12-28Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano-13/+23
2011-11-30rebase -i: interrupt rebase when "commit --amend" failed during "reword"Andrew Wong-13/+23
2011-10-17"rebase -i": support special-purpose editor to edit insn sheetPeter Oberndorfer-1/+14
2011-08-26rebase -i: notice and warn if "exec $cmd" modifies the index or the working treeJunio C Hamano-3/+9
2011-08-26rebase -i: clean error message for --continue after failed execMatthieu Moy-1/+17
2011-06-19rebase -i -p: include non-first-parent commits in todo listAndrew Wong-2/+1
2011-05-27rebase: write a reflog entry when finishingJeff King-1/+3
2011-05-06Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano-1/+1
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong-1/+1
2011-02-25Makefile: do not install sourced rebase scriptsMartin von Zweigbergk-0/+0
2011-02-10rebase -i: remove unnecessary state rebase-rootMartin von Zweigbergk-19/+0
2011-02-10rebase -i: don't read unused variable preserve_mergesMartin von Zweigbergk-1/+0
2011-02-10rebase: remember strategy and strategy optionsMartin von Zweigbergk-2/+0
2011-02-10rebase: remember verbose optionMartin von Zweigbergk-2/+0
2011-02-10rebase: extract code for writing basic stateMartin von Zweigbergk-4/+1
2011-02-10rebase: factor out sub command handlingMartin von Zweigbergk-31/+3
2011-02-10rebase: make -v a tiny bit more verboseMartin von Zweigbergk-14/+0
2011-02-10rebase -i: align variable namesMartin von Zweigbergk-61/+59
2011-02-10rebase: show consistent conflict resolution hintMartin von Zweigbergk-3/+1
2011-02-10rebase: factor out call to pre-rebase hookMartin von Zweigbergk-14/+0
2011-02-10rebase: factor out clean work tree checkMartin von Zweigbergk-2/+0
2011-02-10rebase: factor out reference parsingMartin von Zweigbergk-44/+4
2011-02-10rebase: reorder validation stepsMartin von Zweigbergk-2/+2
2011-02-10rebase -i: remove now unnecessary directory checksMartin von Zweigbergk-6/+0
2011-02-10rebase: factor out command line option processingMartin von Zweigbergk-162/+62
2011-02-10rebase: align variable contentMartin von Zweigbergk-5/+11
2011-02-10rebase: align variable namesMartin von Zweigbergk-240/+240
2011-02-10rebase: act on command line outside parsing loopMartin von Zweigbergk-149/+151
2011-01-27Merge branch 'maint'Junio C Hamano-2/+2
2011-01-27rebase -i: clarify in-editor documentation of "exec"Jonathan Nieder-1/+1
2011-01-26rebase: use explicit "--" with checkoutJeff King-1/+1
2010-12-12Merge branch 'mz/rebase-i-verify'Junio C Hamano-0/+2
2010-11-29Merge branch 'rr/needs-clean-work-tree'Junio C Hamano-11/+3
2010-11-23rebase: support --verifyMartin von Zweigbergk-0/+2
2010-11-09rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard-7/+33
2010-11-09rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard-0/+4
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra-11/+3
2010-09-17git-rebase--interactive.sh: replace cut with ${v%% *}Chris Johnsen-1/+1
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano-3/+3
2010-08-31Merge branch 'hv/autosquash-config'Junio C Hamano-0/+4
2010-08-21Merge branch 'mm/rebase-i-exec'Junio C Hamano-6/+43
2010-08-15cherry-pick/revert: Use advise() for hintsJonathan Nieder-3/+3
2010-08-13git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey-2/+2
2010-08-13git-rebase--interactive.sh: rework skip_unnecessary_picksBrandon Casey-9/+14
2010-08-11rebase -i: add exec command to launch a shell commandMatthieu Moy-3/+35
2010-07-25git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey-6/+6
2010-07-14add configuration variable for --autosquash option of interactive rebaseHeiko Voigt-0/+4
2010-07-05rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano-5/+5
2010-07-05rebase-i: style fixJunio C Hamano-5/+6
2010-06-11rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort-1/+2