aboutsummaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAge
* tests: use "$TEST_DIRECTORY" instead of ".."Jeff King2009-08-09
* Remove filename from conflict markersMartin Renold2009-07-01
* rebase -i: avoid 'git reset' when possibleJohannes Schindelin2009-03-03
* Merge branch 'js/maint-rebase-i-submodule'Junio C Hamano2009-01-31
|\
| * Fix submodule squashing into unrelated commitJohannes Schindelin2009-01-28
| * rebase -i squashes submodule changes into unrelated commitJunio C Hamano2009-01-28
* | t3404 & t3411: undo copy&pasteJohannes Schindelin2009-01-28
|/
* t3404: Add test case for auto-amending only edited commits after "edit"Stephan Beyer2009-01-15
* t3404: Add test case for aborted --continue after "edit"Stephan Beyer2009-01-15
* rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin2008-10-10
* tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-03
* rebase -i -p: fix parent rewritingThomas Rast2008-08-13
* rebase -i -p: handle index and workdir correctlyThomas Rast2008-08-13
* Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-15
* t3404: test two "preserve merges with -p" casesStephan Beyer2008-07-13
* t3404: stricter tests for git-rebase--interactiveStephan Beyer2008-06-22
* Fix tests breaking when checkout path contains shell metacharactersBryan Donlan2008-05-05
* add test_cmp function for test scriptsJeff King2008-03-13
* remove use of "tail -n 1" and "tail -1"Jeff King2008-03-13
* grep portability fix: don't use "-e" or "-q"Jeff King2008-03-13
* use build-time SHELL_PATH in test scriptsJeff King2008-02-29
* t3404: use configured shell instead of /bin/shJeff King2008-02-20
* Protect get_author_ident_from_commit() from filenames in work treeJunio C Hamano2008-02-13
* Add test for rebase -i with commits that do not pass pre-commitJohannes Schindelin2008-01-28
* rebase -p -i: handle "no changes" gracefullyJohannes Schindelin2007-12-17
* rebase -i: move help to end of todo fileJohannes Schindelin2007-11-22
* Merge branch 'maint'Junio C Hamano2007-11-14
|\
| * t/t3404: fix test for a bogus todo file.Junio C Hamano2007-11-13
* | Merge branch 'js/rebase-i'Junio C Hamano2007-10-03
|\ \
| * | rebase -i: work on a detached HEADJohannes Schindelin2007-09-26
* | | Merge branch 'maint'Junio C Hamano2007-09-29
|\ \ \ | |/ / |/| / | |/
| * rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin2007-09-29
* | rebase -i: commit when continuing after "edit"Johannes Schindelin2007-09-25
|/
* rebase -i: fix squashing corner caseJohannes Schindelin2007-08-23
* t3404: fix "fake-editor"Junio C Hamano2007-08-13
* rebase -i: fix for optional [branch] parameterJohannes Schindelin2007-08-01
* rebase -i: ignore patches that are already in the upstreamJohannes Schindelin2007-08-01
* rebase -i: fix interrupted squashingJohannes Schindelin2007-07-27
* rebase -i: call editor just once for a multi-squashJohannes Schindelin2007-07-21
* rebase -i: remember the settings of -v, -s and -p when interruptedJohannes Schindelin2007-07-08
* rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin2007-07-08
* Teach rebase -i about --preserve-mergesJohannes Schindelin2007-06-26
* rebase -i: provide reasonable reflog for the rebased branchJohannes Schindelin2007-06-26
* rebase -i: several cleanupsJohannes Schindelin2007-06-26
* Teach rebase an interactive modeJohannes Schindelin2007-06-24