summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2010-01-14rebase -i: Introduce a constant AMENDLibravatar Michael Haggerty1-4/+12
2010-01-14rebase -i: Introduce a constant AUTHOR_SCRIPTLibravatar Michael Haggerty1-6/+11
2010-01-14rebase -i: Document how temporary files are usedLibravatar Michael Haggerty1-7/+34
2010-01-14rebase -i: Use symbolic constant $MSG consistentlyLibravatar Michael Haggerty1-4/+4
2010-01-14rebase -i: Use "test -n" instead of "test ! -z"Libravatar Michael Haggerty1-1/+1
2010-01-14rebase -i: Inline expressionLibravatar Michael Haggerty1-2/+1
2010-01-14rebase -i: Remove dead codeLibravatar Michael Haggerty1-1/+0
2010-01-14rebase -i: Make the condition for an "if" more transparentLibravatar Michael Haggerty1-1/+2
2010-01-13Merge branch 'jc/checkout-merge-base'Libravatar Junio C Hamano1-1/+20
2010-01-12rebase-i: Ignore comments and blank lines in peek_next_commandLibravatar Michael Haggerty1-1/+1
2010-01-11rebase--interactive: Ignore comments and blank lines in peek_next_commandLibravatar Michael Haggerty1-1/+1
2010-01-07rebase -i: teach --onto A...B syntaxLibravatar Nanako Shiraishi1-1/+20
2010-01-06rebase -i --autosquash: auto-squash commitsLibravatar Nanako Shiraishi1-0/+37
2009-12-19Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2009-12-19rebase -i: abort cleanly if the editor fails to launchLibravatar Björn Gustavsson1-1/+1
2009-12-07Add a command "fixup" to rebase --interactiveLibravatar Michael Haggerty1-10/+35
2009-12-03Merge branch 'rs/work-around-grep-opt-insanity' into maintLibravatar Junio C Hamano1-5/+5
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Libravatar Junio C Hamano1-5/+5
2009-11-23Protect scripted Porcelains from GREP_OPTIONS insanityLibravatar Junio C Hamano1-5/+5
2009-11-15Merge branch 'fc/doc-fast-forward'Libravatar Junio C Hamano1-3/+3
2009-10-28Merge branch 'maint'Libravatar Junio C Hamano1-1/+6
2009-10-27rebase -i: more graceful handling of invalid commandsLibravatar Jan Krüger1-1/+6
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-3/+3
2009-10-19rebase -i: fix reword when using a terminal editorLibravatar Stephen Boyd1-1/+1
2009-10-07Teach 'rebase -i' the command "reword"Libravatar Björn Gustavsson1-0/+9
2009-07-22Fix rebase -p --ontoLibravatar Greg Price1-1/+1
2009-06-11Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maintLibravatar Junio C Hamano1-1/+1
2009-06-11rebase--interactive: remote stray closing parenthesisLibravatar Uwe Kleine-König1-1/+1
2009-03-03rebase -i: avoid 'git reset' when possibleLibravatar Johannes Schindelin1-0/+26
2009-01-31Merge branch 'js/maint-rebase-i-submodule'Libravatar Junio C Hamano1-5/+4
2009-01-28Fix submodule squashing into unrelated commitLibravatar Johannes Schindelin1-5/+4
2009-01-26rebase -i: correctly remember --root flag across --continueLibravatar Junio C Hamano1-2/+8
2009-01-25rebase -i --root: fix check for number of argumentsLibravatar Johannes Schindelin1-1/+2
2009-01-17Merge branch 'tr/rebase-root'Libravatar Junio C Hamano1-31/+79
2009-01-13Merge branch 'maint-1.6.0' into maintLibravatar Junio C Hamano1-1/+1
2009-01-13Avoid spurious error messages on error mistakes.Libravatar Pierre Habouzit1-1/+1
2009-01-11rebase -i: learn to rebase root commitLibravatar Thomas Rast1-31/+78
2009-01-03rebase -i: execute hook only after argument checkingLibravatar Thomas Rast1-2/+3
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneLibravatar Johannes Schindelin1-3/+12
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneLibravatar Johannes Sixt1-2/+1
2008-11-02Merge branch 'sh/rebase-i-p'Libravatar Junio C Hamano1-49/+83
2008-10-22git-rebase--interactive.sh: comparision with == is bashismLibravatar Junio C Hamano1-1/+1
2008-10-20rebase-i-p: minimum fix to obvious issuesLibravatar Junio C Hamano1-3/+4
2008-10-19Merge branch 'sh/maint-rebase3'Libravatar Junio C Hamano1-2/+35
2008-10-19Merge branch 'ns/rebase-noverify'Libravatar Junio C Hamano1-1/+9
2008-10-16rebase-i-p: if todo was reordered use HEAD as the rewritten parentLibravatar Stephen Haberman1-0/+9
2008-10-16rebase-i-p: do not include non-first-parent commits touching UPSTREAMLibravatar Stephen Haberman1-1/+2
2008-10-16rebase-i-p: only list commits that require rewriting in todoLibravatar Stephen Haberman1-25/+52
2008-10-16rebase-i-p: fix 'no squashing merges' tripping up non-mergesLibravatar Stephen Haberman1-5/+9
2008-10-16rebase-i-p: delay saving current-commit to REWRITTEN if squashingLibravatar Stephen Haberman1-5/+10