summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
AgeCommit message (Expand)AuthorFilesLines
2010-06-22Merge branch 'ic/maint-rebase-i-abort' into maintLibravatar Junio C Hamano1-0/+10
2010-06-11rebase -i: Abort cleanly if new base cannot be checked outLibravatar Ian Ward Comfort1-0/+10
2010-06-11rebase -i -p: document shortcomingsLibravatar Jonathan Nieder1-0/+6
2010-04-03Merge branch 'mb/rebase-i-no-ff'Libravatar Junio C Hamano1-4/+32
2010-04-03Merge branch 'do/rebase-i-arbitrary'Libravatar Junio C Hamano1-0/+9
2010-03-24Teach rebase the --no-ff option.Libravatar Marc Branchaud1-4/+32
2010-03-14rebase--interactive: don't require what's rebased to be a branchLibravatar Dave Olszewski1-0/+9
2010-03-12rebase: support automatic notes copyingLibravatar Thomas Rast1-0/+24
2010-01-14rebase -i: Retain user-edited commit messages after squash/fixup conflictsLibravatar Michael Haggerty1-0/+36
2010-01-14t3404: Set up more of the test repo in the "setup" stepLibravatar Michael Haggerty1-25/+26
2010-01-14rebase -i: For fixup commands without squashes, do not start editorLibravatar Michael Haggerty1-4/+3
2010-01-14rebase -i: Improve consistency of commit count in generated commit messagesLibravatar Michael Haggerty1-2/+2
2010-01-14t3404: Test the commit count in commit messages generated by "rebase -i"Libravatar Michael Haggerty1-2/+7
2010-01-12rebase-i: Ignore comments and blank lines in peek_next_commandLibravatar Michael Haggerty1-0/+24
2009-12-07Add a command "fixup" to rebase --interactiveLibravatar Michael Haggerty1-0/+30
2009-12-06t3404: Use test_commit to set up test repositoryLibravatar Michael Haggerty1-46/+20
2009-10-07Teach 'rebase -i' the command "reword"Libravatar Björn Gustavsson1-0/+14
2009-08-09tests: use "$TEST_DIRECTORY" instead of ".."Libravatar Jeff King1-1/+1
2009-07-01Remove filename from conflict markersLibravatar Martin Renold1-2/+2
2009-03-03rebase -i: avoid 'git reset' when possibleLibravatar Johannes Schindelin1-0/+11
2009-01-31Merge branch 'js/maint-rebase-i-submodule'Libravatar Junio C Hamano1-0/+26
2009-01-28t3404 & t3411: undo copy&pasteLibravatar Johannes Schindelin1-33/+4
2009-01-28Fix submodule squashing into unrelated commitLibravatar Johannes Schindelin1-1/+1
2009-01-28rebase -i squashes submodule changes into unrelated commitLibravatar Junio C Hamano1-0/+26
2009-01-15t3404: Add test case for auto-amending only edited commits after "edit"Libravatar Stephan Beyer1-0/+17
2009-01-15t3404: Add test case for aborted --continue after "edit"Libravatar Stephan Beyer1-0/+15
2008-10-10rebase -i: do not fail when there is no commit to cherry-pickLibravatar Johannes Schindelin1-0/+11
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Libravatar Nanako Shiraishi1-1/+1
2008-08-13rebase -i -p: fix parent rewritingLibravatar Thomas Rast1-0/+12
2008-08-13rebase -i -p: handle index and workdir correctlyLibravatar Thomas Rast1-0/+6
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Libravatar Johannes Schindelin1-4/+4
2008-07-13t3404: test two "preserve merges with -p" casesLibravatar Stephan Beyer1-5/+21
2008-06-22t3404: stricter tests for git-rebase--interactiveLibravatar Stephan Beyer1-9/+34
2008-05-05Fix tests breaking when checkout path contains shell metacharactersLibravatar Bryan Donlan1-2/+1
2008-03-13add test_cmp function for test scriptsLibravatar Jeff King1-2/+2
2008-03-13remove use of "tail -n 1" and "tail -1"Libravatar Jeff King1-2/+2
2008-03-13grep portability fix: don't use "-e" or "-q"Libravatar Jeff King1-2/+1
2008-02-29use build-time SHELL_PATH in test scriptsLibravatar Jeff King1-1/+1
2008-02-20t3404: use configured shell instead of /bin/shLibravatar Jeff King1-2/+2
2008-02-13Protect get_author_ident_from_commit() from filenames in work treeLibravatar Junio C Hamano1-0/+22
2008-01-28Add test for rebase -i with commits that do not pass pre-commitLibravatar Johannes Schindelin1-0/+16
2007-12-17rebase -p -i: handle "no changes" gracefullyLibravatar Johannes Schindelin1-0/+6
2007-11-22rebase -i: move help to end of todo fileLibravatar Johannes Schindelin1-1/+2
2007-11-14Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-11-13t/t3404: fix test for a bogus todo file.Libravatar Junio C Hamano1-1/+1
2007-10-03Merge branch 'js/rebase-i'Libravatar Junio C Hamano1-0/+8
2007-09-29Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-09-29rebase -i: squash should retain the authorship of the _first_ commitLibravatar Johannes Schindelin1-1/+1
2007-09-26rebase -i: work on a detached HEADLibravatar Johannes Schindelin1-0/+8
2007-09-25rebase -i: commit when continuing after "edit"Libravatar Johannes Schindelin1-1/+13
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 06:14:36 +0000