From: Manuel Reimer <Manuel.Spam@nurfuerspam.de>
To: git@vger.kernel.org
Subject: Correct way to pull using subtree merge without guesswork?
Date: Tue, 24 Jan 2012 18:49:19 +0100 [thread overview]
Message-ID: <jfmr88$1p8$1@dough.gmane.org> (raw)
Hello,
can someone please tell me, if this is the correct syntax for using "git pull"
to pull in "subtree merging strategy", if I don't want to allow git to guess
where to do the changes:
git pull -s subtree -X subtree=path/to/subtree externalproject master
Returns with success, but is "-X subtree=" the right way to force a subtree path
and disallow git to autodetect the subtree?
$ git --version
git version 1.7.4.4
Thank you very much in advance
Yours
Manuel
next reply other threads:[~2012-01-24 17:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 17:49 Manuel Reimer [this message]
2012-01-24 18:27 ` Correct way to pull using subtree merge without guesswork? Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='jfmr88$1p8$1@dough.gmane.org' \
--to=manuel.spam@nurfuerspam.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox