git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2] Fixed typo in git-pull manual

From
Mihai Capotă <mihai@mihaic.ro>
Date
Mar 27, 2013, 17:05 UTC
Message-ID
<1364403956-20443-1-git-send-email-mihai@mihaic.ro>
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
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 4 in “Fixed typo in git-pull manual”
  1. Fixed typo in git-pull manualMihai Capotă, Mar 27, 2013
  2. Junio C HamanoMar 27, 2013
  3. Fixed typo in git-pull manualMihai Capotă, Mar 27, 2013
  4. Junio C HamanoMar 27, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.