summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)Author
2011-08-26rebase -i: clean error message for --continue after failed execMatthieu Moy
2011-06-19rebase -i -p: include non-first-parent commits in todo listAndrew Wong
2011-05-27rebase: write a reflog entry when finishingJeff King
2010-12-28Merge branch 'maint'Junio C Hamano
2010-12-28Fix false positives in t3404 due to SHELL=/bin/falseRobin H. Johnson
2010-12-08Merge branch 'jh/notes-merge'Junio C Hamano
2010-11-17notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland
2010-11-09t3404: do not use 'describe' to implement test_cmp_revJunio C Hamano
2010-11-09t3404 (rebase -i): introduce helper to check position of HEADJonathan Nieder
2010-11-09t3404 (rebase -i): move comment to descriptionJonathan Nieder
2010-11-09t3404 (rebase -i): unroll test_commit loopsJonathan Nieder
2010-11-09tests: add missing &&, batch 2Jonathan Nieder
2010-09-06t3404 & t7508: cd inside subshell instead of aroundJens Lehmann
2010-08-22Merge branch 'mm/rebase-i-exec'Junio C Hamano
2010-08-22Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-08-11unpack_trees: group error messages by typeMatthieu Moy
2010-08-11test-lib: user-friendly alternatives to test [-d|-f|-e]Matthieu Moy
2010-08-11rebase -i: add exec command to launch a shell commandMatthieu Moy
2010-07-26git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey
2010-07-06rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano
2010-06-21Merge branch 'ic/maint-rebase-i-abort'Junio C Hamano
2010-06-11rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort
2010-06-11rebase -i -p: document shortcomingsJonathan Nieder
2010-04-03Merge branch 'mb/rebase-i-no-ff'Junio C Hamano
2010-04-03Merge branch 'do/rebase-i-arbitrary'Junio C Hamano
2010-03-24Teach rebase the --no-ff option.Marc Branchaud
2010-03-15rebase--interactive: don't require what's rebased to be a branchDave Olszewski
2010-03-13rebase: support automatic notes copyingThomas Rast
2010-01-14rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty
2010-01-14t3404: Set up more of the test repo in the "setup" stepMichael Haggerty
2010-01-14rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty
2010-01-14rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty
2010-01-14t3404: Test the commit count in commit messages generated by "rebase -i"Michael Haggerty
2010-01-12rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty
2009-12-07Add a command "fixup" to rebase --interactiveMichael Haggerty
2009-12-07t3404: Use test_commit to set up test repositoryMichael Haggerty
2009-10-08Teach 'rebase -i' the command "reword"Björn Gustavsson
2009-08-09tests: use "$TEST_DIRECTORY" instead of ".."Jeff King
2009-07-02Remove filename from conflict markersMartin Renold
2009-03-03rebase -i: avoid 'git reset' when possibleJohannes Schindelin
2009-02-01Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano
2009-01-29t3404 & t3411: undo copy&pasteJohannes Schindelin
2009-01-28Fix submodule squashing into unrelated commitJohannes Schindelin
2009-01-28rebase -i squashes submodule changes into unrelated commitJunio C Hamano
2009-01-15t3404: Add test case for auto-amending only edited commits after "edit"Stephan Beyer
2009-01-15t3404: Add test case for aborted --continue after "edit"Stephan Beyer
2008-10-10rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi
2008-08-13rebase -i -p: fix parent rewritingThomas Rast
2008-08-13rebase -i -p: handle index and workdir correctlyThomas Rast