git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Mihai Capotă" <mihai@mihaic.ro>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v2] Fixed typo in git-pull manual
Date: Wed, 27 Mar 2013 18:05:56 +0100	[thread overview]
Message-ID: <1364403956-20443-1-git-send-email-mihai@mihaic.ro> (raw)
In-Reply-To: <7vmwtoomav.fsf@alter.siamese.dyndns.org>

Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
---
 Documentation/git-pull.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c975743..24ab07a 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -218,7 +218,7 @@ $ git merge origin/next
 ------------------------------------------------
 
 
-If you tried a pull which resulted in a complex conflicts and
+If you tried a pull which resulted in complex conflicts and
 would want to start over, you can recover with 'git reset'.
 
 
-- 
1.7.9.5

  reply	other threads:[~2013-03-27 17:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-27 11:04 [PATCH] Fixed typo in git-pull manual Mihai Capotă
2013-03-27 16:11 ` Junio C Hamano
2013-03-27 17:05   ` Mihai Capotă [this message]
2013-03-27 18:01     ` [PATCH v2] " 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=1364403956-20443-1-git-send-email-mihai@mihaic.ro \
    --to=mihai@mihaic.ro \
    --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).