summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)Author
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
2008-07-16Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin
2008-07-13t3404: test two "preserve merges with -p" casesStephan Beyer
2008-06-23t3404: stricter tests for git-rebase--interactiveStephan Beyer
2008-05-05Fix tests breaking when checkout path contains shell metacharactersBryan Donlan
2008-03-13add test_cmp function for test scriptsJeff King
2008-03-13remove use of "tail -n 1" and "tail -1"Jeff King
2008-03-13grep portability fix: don't use "-e" or "-q"Jeff King
2008-02-29use build-time SHELL_PATH in test scriptsJeff King
2008-02-21t3404: use configured shell instead of /bin/shJeff King
2008-02-13Protect get_author_ident_from_commit() from filenames in work treeJunio C Hamano
2008-01-28Add test for rebase -i with commits that do not pass pre-commitJohannes Schindelin
2007-12-18rebase -p -i: handle "no changes" gracefullyJohannes Schindelin
2007-11-22rebase -i: move help to end of todo fileJohannes Schindelin
2007-11-14Merge branch 'maint'Junio C Hamano
2007-11-13t/t3404: fix test for a bogus todo file.Junio C Hamano
2007-10-03Merge branch 'js/rebase-i'Junio C Hamano
2007-09-30Merge branch 'maint'Junio C Hamano
2007-09-30rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin
2007-09-26rebase -i: work on a detached HEADJohannes Schindelin
2007-09-26rebase -i: commit when continuing after "edit"Johannes Schindelin
2007-08-23rebase -i: fix squashing corner caseJohannes Schindelin
2007-08-13t3404: fix "fake-editor"Junio C Hamano
2007-08-02rebase -i: fix for optional [branch] parameterJohannes Schindelin
2007-08-02rebase -i: ignore patches that are already in the upstreamJohannes Schindelin
2007-07-27rebase -i: fix interrupted squashingJohannes Schindelin
2007-07-21rebase -i: call editor just once for a multi-squashJohannes Schindelin
2007-07-09rebase -i: remember the settings of -v, -s and -p when interruptedJohannes Schindelin
2007-07-09rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin
2007-06-27Teach rebase -i about --preserve-mergesJohannes Schindelin
2007-06-27rebase -i: provide reasonable reflog for the rebased branchJohannes Schindelin
2007-06-27rebase -i: several cleanupsJohannes Schindelin
2007-06-25Teach rebase an interactive modeJohannes Schindelin