Log - 938791cd01bfb9729feed95a12f743fd077d0467 - jrn/git

938791c git-rebase--interactive.sh: use printf instead of echo to print commit message by Brandon Casey · 15 years ago
57f2b6b rebase-i: do not get fooled by a log message ending with backslash by Junio C Hamano · 15 years ago
9cb16a9 Merge branch 'ic/maint-rebase-i-abort' by Junio C Hamano · 15 years ago
b096374 rebase -i: Abort cleanly if new base cannot be checked out by Ian Ward Comfort · 15 years ago
cddb42d rebase -i -p: document shortcomings by Jonathan Nieder · 15 years ago
9234b00 Merge branch 'mb/rebase-i-no-ff' by Junio C Hamano · 15 years ago
df9930c Merge branch 'do/rebase-i-arbitrary' by Junio C Hamano · 15 years ago
b499549 Teach rebase the --no-ff option. by Marc Branchaud · 15 years ago
2ec33cd rebase--interactive: don't require what's rebased to be a branch by Dave Olszewski · 15 years ago
eb2151b rebase: support automatic notes copying by Thomas Rast · 15 years ago
6bdcd0d rebase -i: Retain user-edited commit messages after squash/fixup conflicts by Michael Haggerty · 15 years ago
6c4c44c t3404: Set up more of the test repo in the "setup" step by Michael Haggerty · 15 years ago
a25eb13 rebase -i: For fixup commands without squashes, do not start editor by Michael Haggerty · 15 years ago
5065ed2 rebase -i: Improve consistency of commit count in generated commit messages by Michael Haggerty · 15 years ago
959c0d0 t3404: Test the commit count in commit messages generated by "rebase -i" by Michael Haggerty · 15 years ago
234b3da rebase-i: Ignore comments and blank lines in peek_next_command by Michael Haggerty · 15 years ago
0205e72 Add a command "fixup" to rebase --interactive by Michael Haggerty · 15 years ago
163f392 t3404: Use test_commit to set up test repository by Michael Haggerty · 15 years ago
6741aa6 Teach 'rebase -i' the command "reword" by Björn Gustavsson · 15 years ago
eaf0551 tests: use "$TEST_DIRECTORY" instead of ".." by Jeff King · 16 years ago
606475f Remove filename from conflict markers by Martin Renold · 16 years ago
0e757e3 rebase -i: avoid 'git reset' when possible by Johannes Schindelin · 16 years ago
2925414 Merge branch 'js/maint-rebase-i-submodule' by Junio C Hamano · 16 years ago
29a0334 t3404 & t3411: undo copy&paste by Johannes Schindelin · 16 years ago
94c88ed Fix submodule squashing into unrelated commit by Johannes Schindelin · 16 years ago
9674769 rebase -i squashes submodule changes into unrelated commit by Junio C Hamano · 16 years ago
f8aa1b6 t3404: Add test case for auto-amending only edited commits after "edit" by Stephan Beyer · 16 years ago
dc7f55c t3404: Add test case for aborted --continue after "edit" by Stephan Beyer · 16 years ago
ff74126 rebase -i: do not fail when there is no commit to cherry-pick by Johannes Schindelin · 16 years ago
0cb0e14 tests: use "git xyzzy" form (t0000 - t3599) by Nanako Shiraishi · 17 years ago
a96dc01 rebase -i -p: fix parent rewriting by Thomas Rast · 17 years ago
71d9451 rebase -i -p: handle index and workdir correctly by Thomas Rast · 17 years ago
28ed6e7 Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" by Johannes Schindelin · 17 years ago
5352a82 t3404: test two "preserve merges with -p" cases by Stephan Beyer · 17 years ago
ab73679 t3404: stricter tests for git-rebase--interactive by Stephan Beyer · 17 years ago
f69e836 Fix tests breaking when checkout path contains shell metacharacters by Bryan Donlan · 17 years ago
82ebb0b add test_cmp function for test scripts by Jeff King · 17 years ago
b4ce54f remove use of "tail -n 1" and "tail -1" by Jeff King · 17 years ago
aadbe44 grep portability fix: don't use "-e" or "-q" by Jeff King · 17 years ago
7cf7f54 use build-time SHELL_PATH in test scripts by Jeff King · 17 years ago
1bd38e8 t3404: use configured shell instead of /bin/sh by Jeff King · 17 years ago
077b725 Protect get_author_ident_from_commit() from filenames in work tree by Junio C Hamano · 17 years ago
752527f Add test for rebase -i with commits that do not pass pre-commit by Johannes Schindelin · 17 years ago
34454e8 rebase -p -i: handle "no changes" gracefully by Johannes Schindelin · 17 years ago
6047a23 rebase -i: move help to end of todo file by Johannes Schindelin · 17 years ago
fb5fd01 Merge branch 'maint' by Junio C Hamano · 17 years ago
aac5bf0 t/t3404: fix test for a bogus todo file. by Junio C Hamano · 17 years ago
9b0185c Merge branch 'js/rebase-i' by Junio C Hamano · 17 years ago
2af89f1 Merge branch 'maint' by Junio C Hamano · 17 years ago
81ab1cb rebase -i: squash should retain the authorship of the _first_ commit by Johannes Schindelin · 17 years ago
73697a0 rebase -i: work on a detached HEAD by Johannes Schindelin · 17 years ago
be6ff20 rebase -i: commit when continuing after "edit" by Johannes Schindelin · 17 years ago
1d25c8c rebase -i: fix squashing corner case by Johannes Schindelin · 18 years ago
77b258f t3404: fix "fake-editor" by Junio C Hamano · 18 years ago
c9e6589 rebase -i: fix for optional [branch] parameter by Johannes Schindelin · 18 years ago
96ffe89 rebase -i: ignore patches that are already in the upstream by Johannes Schindelin · 18 years ago
fb47cfb rebase -i: fix interrupted squashing by Johannes Schindelin · 18 years ago
6368f3f rebase -i: call editor just once for a multi-squash by Johannes Schindelin · 18 years ago
8e4a91b rebase -i: remember the settings of -v, -s and -p when interrupted by Johannes Schindelin · 18 years ago
18640d9 rebase -i: handle --continue more like non-interactive rebase by Johannes Schindelin · 18 years ago
f09c9b8 Teach rebase -i about --preserve-merges by Johannes Schindelin · 18 years ago
68a163c rebase -i: provide reasonable reflog for the rebased branch by Johannes Schindelin · 18 years ago
c54b781 rebase -i: several cleanups by Johannes Schindelin · 18 years ago
1b1dce4 Teach rebase an interactive mode by Johannes Schindelin · 18 years ago