* [PATCH] Fixed typo in git-pull manual
@ 2013-03-27 11:04 Mihai Capotă
2013-03-27 16:11 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Mihai Capotă @ 2013-03-27 11:04 UTC (permalink / raw)
To: git; +Cc: gitster, Mihai Capotă
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..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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Fixed typo in git-pull manual
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 ` [PATCH v2] " Mihai Capotă
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2013-03-27 16:11 UTC (permalink / raw)
To: Mihai Capotă; +Cc: git
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.
> 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'.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] Fixed typo in git-pull manual
2013-03-27 16:11 ` Junio C Hamano
@ 2013-03-27 17:05 ` Mihai Capotă
2013-03-27 18:01 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Mihai Capotă @ 2013-03-27 17:05 UTC (permalink / raw)
To: git; +Cc: gitster
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Fixed typo in git-pull manual
2013-03-27 17:05 ` [PATCH v2] " Mihai Capotă
@ 2013-03-27 18:01 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2013-03-27 18:01 UTC (permalink / raw)
To: Mihai Capotă; +Cc: git
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-27 18:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH v2] " Mihai Capotă
2013-03-27 18:01 ` Junio C Hamano
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).