Log - 92203e6432cd77c3dfc82bd475a4c802085cffcb - jrn/git

a9f739c rebase --preserve-merges: ignore "merge.log" config by Ralf Thielow · 12 years ago
3f21398 add tests for rebasing merged history by Martin von Zweigbergk · 12 years ago
12bf828 rebase -i -p: include non-first-parent commits in todo list by Andrew Wong · 14 years ago
c192f9c git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff by Andrew Wong · 14 years ago
1393123 Change incorrect "remote branch" to "remote tracking branch" in C code by Matthieu Moy · 14 years ago
18a8269 tests: subshell indentation stylefix by Jonathan Nieder · 15 years ago
fd4ec4f Several tests: cd inside subshell instead of around by Jens Lehmann · 15 years ago
5d59a40 t3409 t4107 t7406 t9150: use dashless commands by Matthew Ogilvie · 15 years ago
69a8b7c merge: indicate remote tracking branches in merge message by Jeff King · 16 years ago
4fb1a19 rebase -i -p: leave a --cc patch when a merge could not be redone by Johannes Schindelin · 16 years ago
f5b49ea rebase -i -p: Fix --continue after a merge could not be redone by Johannes Sixt · 16 years ago
03c4829 Show a failure of rebase -p if the merge had a conflict by Johannes Sixt · 16 years ago
f8cca01 rebase: Support preserving merges in non-interactive mode by Andreas Ericsson · 16 years ago