summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2012-05-20Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2012-05-20t3404: begin "exchange commits with -p" test with correct preconditionsLibravatar Johannes Sixt1-0/+1
2012-04-30diff --stat: use less columns for change countsLibravatar Zbigniew Jędrzejewski-Szmek1-1/+1
2012-04-09rebase -i continue: don't skip commits that only change submodulesLibravatar John Keeping1-0/+30
2011-08-26rebase -i: clean error message for --continue after failed execLibravatar Matthieu Moy1-0/+14
2011-06-19rebase -i -p: include non-first-parent commits in todo listLibravatar Andrew Wong1-1/+1
2011-05-27rebase: write a reflog entry when finishingLibravatar Jeff King1-1/+1
2010-12-28Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2010-12-28Fix false positives in t3404 due to SHELL=/bin/falseLibravatar Robin H. Johnson1-1/+2
2010-12-08Merge branch 'jh/notes-merge'Libravatar Junio C Hamano1-0/+1
2010-11-17notes.c: Use two newlines (instead of one) when concatenating notesLibravatar Johan Herland1-0/+1
2010-11-09t3404: do not use 'describe' to implement test_cmp_revLibravatar Junio C Hamano1-2/+2
2010-11-09t3404 (rebase -i): introduce helper to check position of HEADLibravatar Jonathan Nieder1-15/+9
2010-11-09t3404 (rebase -i): move comment to descriptionLibravatar Jonathan Nieder1-18/+17
2010-11-09t3404 (rebase -i): unroll test_commit loopsLibravatar Jonathan Nieder1-12/+11
2010-11-09tests: add missing &&, batch 2Libravatar Jonathan Nieder1-3/+3
2010-09-06t3404 & t7508: cd inside subshell instead of aroundLibravatar Jens Lehmann1-3/+3
2010-08-21Merge branch 'mm/rebase-i-exec'Libravatar Junio C Hamano1-2/+63
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-1/+2
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-1/+2
2010-08-11test-lib: user-friendly alternatives to test [-d|-f|-e]Libravatar Matthieu Moy1-9/+9
2010-08-11rebase -i: add exec command to launch a shell commandLibravatar Matthieu Moy1-0/+61
2010-07-25git-rebase--interactive.sh: use printf instead of echo to print commit messageLibravatar Brandon Casey1-1/+7
2010-07-05rebase-i: do not get fooled by a log message ending with backslashLibravatar Junio C Hamano1-0/+18
2010-06-21Merge branch 'ic/maint-rebase-i-abort'Libravatar Junio C Hamano1-0/+10
2010-06-11rebase -i: Abort cleanly if new base cannot be checked outLibravatar Ian Ward Comfort1-0/+10
2010-06-11rebase -i -p: document shortcomingsLibravatar Jonathan Nieder1-0/+6
2010-04-03Merge branch 'mb/rebase-i-no-ff'Libravatar Junio C Hamano1-4/+32
2010-04-03Merge branch 'do/rebase-i-arbitrary'Libravatar Junio C Hamano1-0/+9
2010-03-24Teach rebase the --no-ff option.Libravatar Marc Branchaud1-4/+32
2010-03-14rebase--interactive: don't require what's rebased to be a branchLibravatar Dave Olszewski1-0/+9
2010-03-12rebase: support automatic notes copyingLibravatar Thomas Rast1-0/+24
2010-01-14rebase -i: Retain user-edited commit messages after squash/fixup conflictsLibravatar Michael Haggerty1-0/+36
2010-01-14t3404: Set up more of the test repo in the "setup" stepLibravatar Michael Haggerty1-25/+26
2010-01-14rebase -i: For fixup commands without squashes, do not start editorLibravatar Michael Haggerty1-4/+3
2010-01-14rebase -i: Improve consistency of commit count in generated commit messagesLibravatar Michael Haggerty1-2/+2
2010-01-14t3404: Test the commit count in commit messages generated by "rebase -i"Libravatar Michael Haggerty1-2/+7
2010-01-12rebase-i: Ignore comments and blank lines in peek_next_commandLibravatar Michael Haggerty1-0/+24
2009-12-07Add a command "fixup" to rebase --interactiveLibravatar Michael Haggerty1-0/+30
2009-12-06t3404: Use test_commit to set up test repositoryLibravatar Michael Haggerty1-46/+20
2009-10-07Teach 'rebase -i' the command "reword"Libravatar Björn Gustavsson1-0/+14
2009-08-09tests: use "$TEST_DIRECTORY" instead of ".."Libravatar Jeff King1-1/+1
2009-07-01Remove filename from conflict markersLibravatar Martin Renold1-2/+2
2009-03-03rebase -i: avoid 'git reset' when possibleLibravatar Johannes Schindelin1-0/+11
2009-01-31Merge branch 'js/maint-rebase-i-submodule'Libravatar Junio C Hamano1-0/+26
2009-01-28t3404 & t3411: undo copy&pasteLibravatar Johannes Schindelin1-33/+4
2009-01-28Fix submodule squashing into unrelated commitLibravatar Johannes Schindelin1-1/+1
2009-01-28rebase -i squashes submodule changes into unrelated commitLibravatar Junio C Hamano1-0/+26
2009-01-15t3404: Add test case for auto-amending only edited commits after "edit"Libravatar Stephan Beyer1-0/+17
2009-01-15t3404: Add test case for aborted --continue after "edit"Libravatar Stephan Beyer1-0/+15