# [PATCH] Fixed typo in git-pull manual 4 messages from 2013-03-27 to 2013-03-27. Participants: Mihai Capotă, Junio C Hamano. Thread: https://gitlist.dev/t/33296 ## Mihai Capotă, 2013-03-27 11:04 Subject: [PATCH] Fixed typo in git-pull manual Message-ID: URL: https://gitlist.dev/e/d50c433f40ef6d353966b84250c40d9ecd9de51d.1364381294.git.mihai%40mihaic.ro ``` Signed-off-by: Mihai Capotă --- 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 ``` ## Junio C Hamano, 2013-03-27 16:11 Subject: Re: [PATCH] Fixed typo in git-pull manual Message-ID: <7vmwtoomav.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vmwtoomav.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Mihai Capotă writes: > Signed-off-by: Mihai Capotă > --- 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'. ``` ## Mihai Capotă, 2013-03-27 17:05 Subject: [PATCH v2] Fixed typo in git-pull manual Message-ID: <1364403956-20443-1-git-send-email-mihai@mihaic.ro> URL: https://gitlist.dev/e/1364403956-20443-1-git-send-email-mihai%40mihaic.ro In-Reply-To: <7vmwtoomav.fsf@alter.siamese.dyndns.org> ``` Signed-off-by: Mihai Capotă --- 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 ``` ## Junio C Hamano, 2013-03-27 18:01 Subject: Re: [PATCH v2] Fixed typo in git-pull manual Message-ID: <7vboa4n2mi.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vboa4n2mi.fsf%40alter.siamese.dyndns.org In-Reply-To: <1364403956-20443-1-git-send-email-mihai@mihaic.ro> ``` Thanks. ```