{"thread":{"id":"20240","subject":"[PATCH] subtree merge strategy fails if branch.master.rebase=true","startedAt":"2009-07-26T21:47:45Z","lastAt":"2009-07-26T21:47:45Z","messageCount":1,"participants":["Jason Holden"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"118849","messageId":"1248644865-1998-1-git-send-email-jason.k.holden@gmail.com","threadId":"20240","inReplyTo":null,"subject":"[PATCH] subtree merge strategy fails if branch.master.rebase=true","fromName":"Jason Holden","fromEmail":"jason.k.holden@gmail.com","sentAt":"2009-07-26T21:47:45Z","receivedAt":"2009-07-26T21:47:45Z","isPatch":true,"sender":{"key":"jason.k.holden@gmail.com","avatar":null},"body":"Update documentation so that users pass --no-rebase to the git-pull\ncommand when using the subtree merge strategy.  Without it, if a user\nhas specified in their config file that branch.master.rebase=true,\nthe pull will fail with the following error:\n\n>From /disk2/git_projects/git/Bproject\n * branch            master     -> FETCH_HEAD\nFirst, rewinding head to replay your work on top of it...\nfatal: Could not parse object 'c54bafddcae4679e8a675713251ace678f962aa0^'\nUnknown exit code (128) from command: git-merge-subtree c54bafddcae4679e8a675713251ace678f962aa0^ -- HEAD c54bafddcae4679e8a675713251ace678f962aa0\n\nThe hash value referenced above is the first commit made to the main\nrepository (not the Bproject subtree).\n---\n Documentation/howto/using-merge-subtree.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt\nindex 0953a50..3f5972e 100644\n--- a/Documentation/howto/using-merge-subtree.txt\n+++ b/Documentation/howto/using-merge-subtree.txt\n@@ -37,7 +37,7 @@ $ git merge -s ours --no-commit Bproject/master <2>\n $ git read-tree --prefix=dir-B/ -u Bproject/master <3>\n $ git commit -m \"Merge B project as our subdirectory\" <4>\n \n-$ git pull -s subtree Bproject master <5>\n+$ git pull --no-rebase -s subtree Bproject master <5>\n ----------------\n <1> name the other project \"Bproject\", and fetch.\n <2> prepare for the later step to record the result as a merge.\n-- \n1.6.3.3.497.g2e2f\n"}]}