Restore prefer-rebase to its previous behavior--still working on tests.
authorStephen Haberman <stephen@exigencecorp.com>
Mon, 29 Sep 2008 07:44:40 +0000 (02:44 -0500)
committerStephen Haberman <stephen@exigencecorp.com>
Mon, 29 Sep 2008 07:44:40 +0000 (02:44 -0500)
commit2b6908d8d60b827d3f04a56e1ea892a05d88d1c7
treeb56ffb9e7ce214199bb6753ae24f71662bc1125c
parent63ff02334b0fffbec9d12db8aed5ea70abccadfb
Restore prefer-rebase to its previous behavior--still working on tests.
server/update-prefer-rebase
tests/t2300-server-update-prefer-rebase.sh
tests/t2301-server-update-prefer-rebase-even-if-merges.sh
tests/t2302-server-update-prefer-rebase-new-parent.sh [new file with mode: 0644]