summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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
* rebase -i -p: handle index and workdir correctlyThomas Rast2008-08-131-0/+6
* Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-151-4/+4
* t3404: test two "preserve merges with -p" casesStephan Beyer2008-07-131-5/+21
* t3404: stricter tests for git-rebase--interactiveStephan Beyer2008-06-221-9/+34
* Fix tests breaking when checkout path contains shell metacharactersBryan Donlan2008-05-051-2/+1
* add test_cmp function for test scriptsJeff King2008-03-131-2/+2
* remove use of "tail -n 1" and "tail -1"Jeff King2008-03-131-2/+2
* grep portability fix: don't use "-e" or "-q"Jeff King2008-03-131-2/+1
* use build-time SHELL_PATH in test scriptsJeff King2008-02-291-1/+1
* t3404: use configured shell instead of /bin/shJeff King2008-02-201-2/+2
* Protect get_author_ident_from_commit() from filenames in work treeJunio C Hamano2008-02-131-0/+22
* Add test for rebase -i with commits that do not pass pre-commitJohannes Schindelin2008-01-281-0/+16
* rebase -p -i: handle "no changes" gracefullyJohannes Schindelin2007-12-171-0/+6
* rebase -i: move help to end of todo fileJohannes Schindelin2007-11-221-1/+2
* Merge branch 'maint'Junio C Hamano2007-11-141-1/+1
|\
| * t/t3404: fix test for a bogus todo file.Junio C Hamano2007-11-131-1/+1
* | Merge branch 'js/rebase-i'Junio C Hamano2007-10-031-0/+8
|\ \
| * | rebase -i: work on a detached HEADJohannes Schindelin2007-09-261-0/+8
* | | Merge branch 'maint'Junio C Hamano2007-09-291-1/+1
|\ \ \ | |/ / |/| / | |/
| * rebase -i: squash should retain the authorship of the _first_ commitJohannes Schindelin2007-09-291-1/+1
* | rebase -i: commit when continuing after "edit"Johannes Schindelin2007-09-251-1/+13
|/
* rebase -i: fix squashing corner caseJohannes Schindelin2007-08-231-0/+21
* t3404: fix "fake-editor"Junio C Hamano2007-08-131-17/+19
* rebase -i: fix for optional [branch] parameterJohannes Schindelin2007-08-011-0/+8
* rebase -i: ignore patches that are already in the upstreamJohannes Schindelin2007-08-011-0/+15
* rebase -i: fix interrupted squashingJohannes Schindelin2007-07-271-0/+30
* rebase -i: call editor just once for a multi-squashJohannes Schindelin2007-07-211-0/+9
* rebase -i: remember the settings of -v, -s and -p when interruptedJohannes Schindelin2007-07-081-0/+10
* rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin2007-07-081-1/+15
* Teach rebase -i about --preserve-mergesJohannes Schindelin2007-06-261-0/+22
* rebase -i: provide reasonable reflog for the rebased branchJohannes Schindelin2007-06-261-0/+4
* rebase -i: several cleanupsJohannes Schindelin2007-06-261-0/+2
* Teach rebase an interactive modeJohannes Schindelin2007-06-241-0/+163
View Lorry Controller Status