From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Andreas Krey <a.krey@gmx.de>, John Keeping <john@keeping.me.uk>,
Jeff King <peff@peff.net>, Richard Hansen <rhansen@bbn.com>,
Philip Oakley <philipoakley@iee.org>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v4 6/7] pull: cleanup documentation
Date: Sat, 12 Oct 2013 02:01:59 -0500 [thread overview]
Message-ID: <1381561322-20059-5-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1381561322-20059-1-git-send-email-felipe.contreras@gmail.com>
'origin/master' is very clear, no need to specify the 'remotes/' prefix,
or babysit the user.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-pull.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e09f004..6d55737 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -39,7 +39,7 @@ Assume the following history exists and the current branch is
"`master`":
------------
- A---B---C master on origin
+ A---B---C origin/master
/
D---E---F---G master
------------
@@ -51,7 +51,7 @@ result in a new commit along with the names of the two parent commits
and a log message from the user describing the changes.
------------
- A---B---C remotes/origin/master
+ A---B---C origin/master
/ \
D---E---F---G---H master
------------
--
1.8.4-fc
next prev parent reply other threads:[~2013-10-12 7:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 7:01 [PATCH v4 4/7] pull: add merge-ff-only option Felipe Contreras
2013-10-12 7:01 ` [PATCH v4 0/7] Reject non-ff pulls by default Felipe Contreras
2013-10-12 7:01 ` [PATCH v4 3/7] pull: add --merge option Felipe Contreras
2013-10-12 7:01 ` [PATCH v4 5/7] pull: add warning on non-ff merges Felipe Contreras
2013-10-12 7:01 ` Felipe Contreras [this message]
2013-10-12 7:02 ` [PATCH v4 2/7] pull: refactor $rebase variable into $mode Felipe Contreras
2013-10-12 7:02 ` [PATCH v4 1/7] pull: rename pull.rename to pull.mode Felipe Contreras
2013-10-12 7:02 ` [PATCH v4 7/7] pull: add documentation about non-ff merges Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381561322-20059-5-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=rhansen@bbn.com \
--cc=sandals@crustytoothpaste.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).