git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: [PATCH] Documentation/git-pull: clarify configuration
Date: Tue,  9 Nov 2010 21:56:47 +0100	[thread overview]
Message-ID: <1289336209-28222-1-git-send-email-martin.von.zweigbergk@gmail.com> (raw)

The sentence about 'branch.<name>.rebase' refers to the first sentence
in the paragraph. Clarify by moving it right after that sentence.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
---
 Documentation/git-pull.txt |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c50f7dc..e9c0393 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -92,12 +92,11 @@ include::merge-options.txt[]
 :git-pull: 1
 
 --rebase::
-	Instead of a merge, perform a rebase after fetching.  If
-	there is a remote ref for the upstream branch, and this branch
-	was rebased since last fetched, the rebase uses that information
-	to avoid rebasing non-local changes. To make this the default
-	for branch `<name>`, set configuration `branch.<name>.rebase`
-	to `true`.
+	Instead of a merge, perform a rebase after fetching. To make this
+	the default for branch `<name>`, set configuration
+	`branch.<name>.rebase` to `true`. If there is a remote ref for the
+	upstream branch, and this branch was rebased since last fetched, the
+	rebase uses that information to avoid rebasing non-local changes.
 +
 [NOTE]
 This is a potentially _dangerous_ mode of operation.
-- 
1.7.3.2.167.ga361b

             reply	other threads:[~2010-11-10  2:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-09 20:56 Martin von Zweigbergk [this message]
2010-11-10  3:48 ` [PATCH] Documentation/git-pull: clarify configuration Jonathan Nieder
     [not found]   ` <AANLkTik5MMKWune_i6omu=vXmuVEJqff6Bm0=yNcS9+z@mail.gmail.com>
2010-11-10 17:25     ` When is a patch ready for inclusion? (Re: [PATCH] Documentation/git-pull: clarify configuration) Jonathan Nieder

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=1289336209-28222-1-git-send-email-martin.von.zweigbergk@gmail.com \
    --to=martin.von.zweigbergk@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).