summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* | rebase -i: remove now unnecessary directory checksMartin von Zweigbergk2011-02-101-6/+0
* | rebase: factor out command line option processingMartin von Zweigbergk2011-02-101-162/+62
* | rebase: align variable contentMartin von Zweigbergk2011-02-101-5/+11
* | rebase: align variable namesMartin von Zweigbergk2011-02-101-240/+240
* | rebase: act on command line outside parsing loopMartin von Zweigbergk2011-02-101-149/+151
|/
* Merge branch 'maint'Junio C Hamano2011-01-271-2/+2
|\
| * rebase -i: clarify in-editor documentation of "exec"ko-maintJonathan Nieder2011-01-271-1/+1
| * rebase: use explicit "--" with checkoutJeff King2011-01-261-1/+1
* | Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-121-0/+2
|\ \
| * | rebase: support --verifyMartin von Zweigbergk2010-11-231-0/+2
| |/
* | Merge branch 'rr/needs-clean-work-tree'Junio C Hamano2010-11-291-11/+3
|\ \
| * | Porcelain scripts: Rewrite cryptic "needs update" error messageRamkumar Ramachandra2010-10-281-11/+3
| |/
* | rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard2010-11-091-7/+33
* | rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard2010-11-091-0/+4
|/
* git-rebase--interactive.sh: replace cut with ${v%% *}Chris Johnsen2010-09-171-1/+1
* Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-311-3/+3
|\
| * cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-151-3/+3
* | Merge branch 'hv/autosquash-config'Junio C Hamano2010-08-311-0/+4
|\ \
| * | add configuration variable for --autosquash option of interactive rebaseHeiko Voigt2010-07-141-0/+4
* | | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-211-6/+43
|\ \ \
| * | | git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2010-08-131-2/+2
| * | | git-rebase--interactive.sh: rework skip_unnecessary_picksBrandon Casey2010-08-131-9/+14
| * | | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-111-3/+35
| | |/ | |/|
View Lorry Controller Status