From: Paul Campbell <pcampbell@kemitix.net>
To: git@vger.kernel.org
Cc: Adam Tkac <atkac@redhat.com>,
"David A. Greene" <greened@obbligato.org>,
"Jesper L. Nielsen" <lyager@gmail.com>,
Michael Schubert <mschub@elegosoft.com>,
Techlive Zheng <techlivezheng@gmail.com>
Subject: [PATCH 3/3] contrib/subtree: update documentation
Date: Fri, 15 Feb 2013 22:54:04 +0000 [thread overview]
Message-ID: <CALeLG_nsiAoPbwTU537CcWkBEfbb3A+wsb-yTSA-4kbNkjfWFQ@mail.gmail.com> (raw)
Indicate that repository and refspec are now optional on push and pull.
Add notes to add, push and pull about storing values in .gitsubtree
and their use as default values.
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
---
contrib/subtree/git-subtree.txt | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 7ba853e..2ad9278 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -11,8 +11,8 @@ SYNOPSIS
[verse]
'git subtree' add -P <prefix> <refspec>
'git subtree' add -P <prefix> <repository> <refspec>
-'git subtree' pull -P <prefix> <repository> <refspec...>
-'git subtree' push -P <prefix> <repository> <refspec...>
+'git subtree' pull -P [<prefix> <repository> <refspec...>]
+'git subtree' push -P [<prefix> <repository> <refspec...>]
'git subtree' merge -P <prefix> <commit>
'git subtree' split -P <prefix> [OPTIONS] [<commit>]
@@ -72,7 +72,9 @@ add::
A new commit is created automatically, joining the imported
project's history with your own. With '--squash', imports
only a single commit from the subproject, rather than its
- entire history.
+ entire history. Details of the <prefix> are added to the
+ .gitsubtree file, where they will be used as defaults for
+ 'push' and 'pull'.
merge::
Merge recent changes up to <commit> into the <prefix>
@@ -91,13 +93,16 @@ merge::
pull::
Exactly like 'merge', but parallels 'git pull' in that
it fetches the given commit from the specified remote
- repository.
+ repository. Default values for <repository> and <refspec>
+ are taken from the .gitsubtree file.
push::
Does a 'split' (see below) using the <prefix> supplied
and then does a 'git push' to push the result to the
repository and refspec. This can be used to push your
subtree to different branches of the remote repository.
+ Default values for <repository> and <refspec> are taken
+ from the .gitsubtree file.
split::
Extract a new, synthetic project history from the
--
1.8.1.3.605.g02339dd
reply other threads:[~2013-02-15 22:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=CALeLG_nsiAoPbwTU537CcWkBEfbb3A+wsb-yTSA-4kbNkjfWFQ@mail.gmail.com \
--to=pcampbell@kemitix.net \
--cc=atkac@redhat.com \
--cc=git@vger.kernel.org \
--cc=greened@obbligato.org \
--cc=lyager@gmail.com \
--cc=mschub@elegosoft.com \
--cc=techlivezheng@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).