summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffLibravatar Andrew Wong1-1/+1
2011-02-25Makefile: do not install sourced rebase scriptsLibravatar Martin von Zweigbergk1-0/+0
2011-02-10rebase -i: remove unnecessary state rebase-rootLibravatar Martin von Zweigbergk1-19/+0
2011-02-10rebase -i: don't read unused variable preserve_mergesLibravatar Martin von Zweigbergk1-1/+0
2011-02-10rebase: remember strategy and strategy optionsLibravatar Martin von Zweigbergk1-2/+0
2011-02-10rebase: remember verbose optionLibravatar Martin von Zweigbergk1-2/+0
2011-02-10rebase: extract code for writing basic stateLibravatar Martin von Zweigbergk1-4/+1
2011-02-10rebase: factor out sub command handlingLibravatar Martin von Zweigbergk1-31/+3
2011-02-10rebase: make -v a tiny bit more verboseLibravatar Martin von Zweigbergk1-14/+0
2011-02-10rebase -i: align variable namesLibravatar Martin von Zweigbergk1-61/+59
2011-02-10rebase: show consistent conflict resolution hintLibravatar Martin von Zweigbergk1-3/+1
2011-02-10rebase: factor out call to pre-rebase hookLibravatar Martin von Zweigbergk1-14/+0
2011-02-10rebase: factor out clean work tree checkLibravatar Martin von Zweigbergk1-2/+0
2011-02-10rebase: factor out reference parsingLibravatar Martin von Zweigbergk1-44/+4
2011-02-10rebase: reorder validation stepsLibravatar Martin von Zweigbergk1-2/+2
2011-02-10rebase -i: remove now unnecessary directory checksLibravatar Martin von Zweigbergk1-6/+0
2011-02-10rebase: factor out command line option processingLibravatar Martin von Zweigbergk1-162/+62
2011-02-10rebase: align variable contentLibravatar Martin von Zweigbergk1-5/+11
2011-02-10rebase: align variable namesLibravatar Martin von Zweigbergk1-240/+240
2011-02-10rebase: act on command line outside parsing loopLibravatar Martin von Zweigbergk1-149/+151
2011-01-27Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2011-01-27rebase -i: clarify in-editor documentation of "exec"Libravatar Jonathan Nieder1-1/+1
2011-01-26rebase: use explicit "--" with checkoutLibravatar Jeff King1-1/+1
2010-12-12Merge branch 'mz/rebase-i-verify'Libravatar Junio C Hamano1-0/+2
2010-11-29Merge branch 'rr/needs-clean-work-tree'Libravatar Junio C Hamano1-11/+3
2010-11-23rebase: support --verifyLibravatar Martin von Zweigbergk1-0/+2
2010-11-09rebase: teach --autosquash to match on sha1 in addition to messageLibravatar Kevin Ballard1-7/+33
2010-11-09rebase: better rearranging of fixup!/squash! lines with --autosquashLibravatar Kevin Ballard1-0/+4
2010-10-28Porcelain scripts: Rewrite cryptic "needs update" error messageLibravatar Ramkumar Ramachandra1-11/+3
2010-09-17git-rebase--interactive.sh: replace cut with ${v%% *}Libravatar Chris Johnsen1-1/+1
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Libravatar Junio C Hamano1-3/+3
2010-08-31Merge branch 'hv/autosquash-config'Libravatar Junio C Hamano1-0/+4
2010-08-21Merge branch 'mm/rebase-i-exec'Libravatar Junio C Hamano1-6/+43
2010-08-15cherry-pick/revert: Use advise() for hintsLibravatar Jonathan Nieder1-3/+3
2010-08-13git-rebase--interactive.sh: use printf instead of echo to print commit messageLibravatar Brandon Casey1-2/+2
2010-08-13git-rebase--interactive.sh: rework skip_unnecessary_picksLibravatar Brandon Casey1-9/+14
2010-08-11rebase -i: add exec command to launch a shell commandLibravatar Matthieu Moy1-3/+35
2010-07-25git-rebase--interactive.sh: use printf instead of echo to print commit messageLibravatar Brandon Casey1-6/+6
2010-07-14add configuration variable for --autosquash option of interactive rebaseLibravatar Heiko Voigt1-0/+4
2010-07-05rebase-i: do not get fooled by a log message ending with backslashLibravatar Junio C Hamano1-5/+5
2010-07-05rebase-i: style fixLibravatar Junio C Hamano1-5/+6
2010-06-11rebase -i: Abort cleanly if new base cannot be checked outLibravatar Ian Ward Comfort1-1/+2
2010-04-18rebase-interactive: silence warning when no commits rewrittenLibravatar Jeff King1-0/+1
2010-04-03Merge branch 'mb/rebase-i-no-ff'Libravatar Junio C Hamano1-1/+7
2010-04-03Merge branch 'do/rebase-i-arbitrary'Libravatar Junio C Hamano1-2/+0
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano1-12/+3
2010-03-28rebase -i: make post-rewrite work for 'edit'Libravatar Thomas Rast1-2/+3
2010-03-24Merge branch 'tr/notes-display'Libravatar Junio C Hamano1-2/+50
2010-03-24Teach rebase the --no-ff option.Libravatar Marc Branchaud1-2/+7
2010-03-20rebase -i: use new --ff cherry-pick optionLibravatar Christian Couder1-12/+3