threads / patch / 33296

patchFixed typo in git-pull manual

Subject: [PATCH] Fixed typo in git-pull manual

## tl;dr

4 messages between Mar 27, 2013 and Mar 27, 2013. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Mihai Capotă· Mar 27, 2013, 11:04 UTC · lore
Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
---
 Documentation/git-pull.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-pull.txt +1 −1
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index c975743..eec4c1d 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 a complex conflict and
 would want to start over, you can recover with 'git reset'.
 
 

-- 
1.7.9.5
Junio C Hamano· Mar 27, 2013, 16:11 UTC · re: Mihai Capotă · lore

Re: [PATCH] Fixed typo in git-pull manual

Mihai Capotă <mihai@mihaic.ro> writes:
> Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
> ---
Thanks.

It might be better to make it "which resulted in complex conflicts", though.

Show 14 quoted lines
>  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..eec4c1d 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 a complex conflict and
>  would want to start over, you can recover with 'git reset'.
Mihai Capotă· Mar 27, 2013, 17:05 UTC · re: Junio C Hamano · lore

[PATCH v2] Fixed typo in git-pull manual

Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
---
 Documentation/git-pull.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-pull.txt +1 −1
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

← back to recent threads