summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-091-0/+30
* rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-261-0/+14
* rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-191-1/+1
* rebase: write a reflog entry when finishingJeff King2011-05-271-1/+1
* Merge branch 'maint'Junio C Hamano2010-12-281-1/+2
|\
| * Fix false positives in t3404 due to SHELL=/bin/falseRobin H. Johnson2010-12-281-1/+2
* | Merge branch 'jh/notes-merge'Junio C Hamano2010-12-081-0/+1
|\ \
| * | notes.c: Use two newlines (instead of one) when concatenating notesJohan Herland2010-11-171-0/+1
* | | t3404: do not use 'describe' to implement test_cmp_revJunio C Hamano2010-11-091-2/+2
* | | t3404 (rebase -i): introduce helper to check position of HEADJonathan Nieder2010-11-091-15/+9
* | | t3404 (rebase -i): move comment to descriptionJonathan Nieder2010-11-091-18/+17
* | | t3404 (rebase -i): unroll test_commit loopsJonathan Nieder2010-11-091-12/+11
* | | tests: add missing &&, batch 2Jonathan Nieder2010-11-091-3/+3
| |/ |/|
* | t3404 & t7508: cd inside subshell instead of aroundJens Lehmann2010-09-061-3/+3
* | Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-211-2/+63
|\ \
| * | test-lib: user-friendly alternatives to test [-d|-f|-e]Matthieu Moy2010-08-111-9/+9
| * | rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-111-0/+61
* | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-211-1/+2
|\ \ \ | |_|/ |/| |
| * | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-1/+2
| |/
* | git-rebase--interactive.sh: use printf instead of echo to print commit messageBrandon Casey2010-07-251-1/+7
|/
* rebase-i: do not get fooled by a log message ending with backslashJunio C Hamano2010-07-051-0/+18
* Merge branch 'ic/maint-rebase-i-abort'Junio C Hamano2010-06-211-0/+10
|\
| * rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-111-0/+10
* | rebase -i -p: document shortcomingsJonathan Nieder2010-06-111-0/+6
|/
* Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-031-4/+32
|\
| * Teach rebase the --no-ff option.Marc Branchaud2010-03-241-4/+32
* | Merge branch 'do/rebase-i-arbitrary'Junio C Hamano2010-04-031-0/+9
|\ \
| * | rebase--interactive: don't require what's rebased to be a branchDave Olszewski2010-03-141-0/+9
| |/
* | rebase: support automatic notes copyingThomas Rast2010-03-121-0/+24
|/
* rebase -i: Retain user-edited commit messages after squash/fixup conflictsMichael Haggerty2010-01-141-0/+36
* t3404: Set up more of the test repo in the "setup" stepMichael Haggerty2010-01-141-25/+26
* rebase -i: For fixup commands without squashes, do not start editorMichael Haggerty2010-01-141-4/+3
* rebase -i: Improve consistency of commit count in generated commit messagesMichael Haggerty2010-01-141-2/+2
* t3404: Test the commit count in commit messages generated by "rebase -i"Michael Haggerty2010-01-141-2/+7
* rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-121-0/+24
* Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-071-0/+30
* t3404: Use test_commit to set up test repositoryMichael Haggerty2009-12-061-46/+20
* Teach 'rebase -i' the command "reword"Björn Gustavsson2009-10-071-0/+14
* tests: use "$TEST_DIRECTORY" instead of ".."Jeff King2009-08-091-1/+1
* Remove filename from conflict markersMartin Renold2009-07-011-2/+2
* rebase -i: avoid 'git reset' when possibleJohannes Schindelin2009-03-031-0/+11
* Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano2009-01-311-0/+26
|\
| * Fix submodule squashing into unrelated commitJohannes Schindelin2009-01-281-1/+1
| * rebase -i squashes submodule changes into unrelated commitJunio C Hamano2009-01-281-0/+26
* | t3404 & t3411: undo copy&pasteJohannes Schindelin2009-01-281-33/+4
|/
* t3404: Add test case for auto-amending only edited commits after "edit"Stephan Beyer2009-01-151-0/+17
* t3404: Add test case for aborted --continue after "edit"Stephan Beyer2009-01-151-0/+15
* rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin2008-10-101-0/+11
* tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-031-1/+1
* rebase -i -p: fix parent rewritingThomas Rast2008-08-131-0/+12
View Lorry Controller Status