{"thread":{"id":"29438","subject":"Correct way to pull using subtree merge without guesswork?","startedAt":"2012-01-24T17:49:19Z","lastAt":"2012-01-24T18:27:01Z","messageCount":2,"participants":["Manuel Reimer","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"183020","messageId":"jfmr88$1p8$1@dough.gmane.org","threadId":"29438","inReplyTo":null,"subject":"Correct way to pull using subtree merge without guesswork?","fromName":"Manuel Reimer","fromEmail":"manuel.spam@nurfuerspam.de","sentAt":"2012-01-24T17:49:19Z","receivedAt":"2012-01-24T17:49:19Z","isPatch":false,"sender":{"key":"manuel.spam@nurfuerspam.de","avatar":null},"body":"Hello,\n\ncan someone please tell me, if this is the correct syntax for using \"git pull\" \nto pull in \"subtree merging strategy\", if I don't want to allow git to guess \nwhere to do the changes:\n\ngit pull -s subtree -X subtree=path/to/subtree externalproject master\n\nReturns with success, but is \"-X subtree=\" the right way to force a subtree path \nand disallow git to autodetect the subtree?\n\n$ git --version\ngit version 1.7.4.4\n\nThank you very much in advance\n\nYours\n\nManuel\n"},{"id":"183023","messageId":"7vy5sx2byi.fsf@alter.siamese.dyndns.org","threadId":"29438","inReplyTo":"jfmr88$1p8$1@dough.gmane.org","subject":"Re: Correct way to pull using subtree merge without guesswork?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-24T18:27:01Z","receivedAt":"2012-01-24T18:27:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Manuel Reimer <Manuel.Spam@nurfuerspam.de> writes:\n\n> git pull -s subtree -X subtree=path/to/subtree externalproject master\n>\n> Returns with success, but is \"-X subtree=\" the right way to force a\n> subtree path and disallow git to autodetect the subtree?\n\nMore or less. Note that with the syntax, you cannot still express the\ndistinction between mapping the root of external to path/to/subtree of\nyour current tree and mapping the other way around, but that is not an\nissue in practice.\n\nBy the way, I had an impression that \"-X subtree\" makes \"-s subtree\"\nredundant and unnecessary.\n"}]}