{"thread":{"id":"33296","subject":"[PATCH] Fixed typo in git-pull manual","startedAt":"2013-03-27T11:04:51Z","lastAt":"2013-03-27T18:01:25Z","messageCount":4,"participants":["Mihai Capotă","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"212371","messageId":"d50c433f40ef6d353966b84250c40d9ecd9de51d.1364381294.git.mihai@mihaic.ro","threadId":"33296","inReplyTo":null,"subject":"[PATCH] Fixed typo in git-pull manual","fromName":"Mihai Capotă","fromEmail":"mihai@mihaic.ro","sentAt":"2013-03-27T11:04:51Z","receivedAt":"2013-03-27T11:04:51Z","isPatch":true,"sender":{"key":"mihai@mihaic.ro","avatar":"https://avatars.githubusercontent.com/u/165546?v=4"},"body":"Signed-off-by: Mihai Capotă <mihai@mihaic.ro>\n---\n Documentation/git-pull.txt |    2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex c975743..eec4c1d 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -218,7 +218,7 @@ $ git merge origin/next\n ------------------------------------------------\n \n \n-If you tried a pull which resulted in a complex conflicts and\n+If you tried a pull which resulted in a complex conflict and\n would want to start over, you can recover with 'git reset'.\n \n \n-- \n1.7.9.5\n"},{"id":"212392","messageId":"7vmwtoomav.fsf@alter.siamese.dyndns.org","threadId":"33296","inReplyTo":"d50c433f40ef6d353966b84250c40d9ecd9de51d.1364381294.git.mihai@mihaic.ro","subject":"Re: [PATCH] Fixed typo in git-pull manual","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-27T16:11:04Z","receivedAt":"2013-03-27T16:11:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mihai Capotă <mihai@mihaic.ro> writes:\n\n> Signed-off-by: Mihai Capotă <mihai@mihaic.ro>\n> ---\n\nThanks.\n\nIt might be better to make it \"which resulted in complex conflicts\",\nthough.\n\n>  Documentation/git-pull.txt |    2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\n> index c975743..eec4c1d 100644\n> --- a/Documentation/git-pull.txt\n> +++ b/Documentation/git-pull.txt\n> @@ -218,7 +218,7 @@ $ git merge origin/next\n>  ------------------------------------------------\n>  \n>  \n> -If you tried a pull which resulted in a complex conflicts and\n> +If you tried a pull which resulted in a complex conflict and\n>  would want to start over, you can recover with 'git reset'.\n"},{"id":"212406","messageId":"1364403956-20443-1-git-send-email-mihai@mihaic.ro","threadId":"33296","inReplyTo":"7vmwtoomav.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2] Fixed typo in git-pull manual","fromName":"Mihai Capotă","fromEmail":"mihai@mihaic.ro","sentAt":"2013-03-27T17:05:56Z","receivedAt":"2013-03-27T17:05:56Z","isPatch":true,"sender":{"key":"mihai@mihaic.ro","avatar":"https://avatars.githubusercontent.com/u/165546?v=4"},"body":"Signed-off-by: Mihai Capotă <mihai@mihaic.ro>\n---\n Documentation/git-pull.txt |    2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex c975743..24ab07a 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -218,7 +218,7 @@ $ git merge origin/next\n ------------------------------------------------\n \n \n-If you tried a pull which resulted in a complex conflicts and\n+If you tried a pull which resulted in complex conflicts and\n would want to start over, you can recover with 'git reset'.\n \n \n-- \n1.7.9.5\n"},{"id":"212419","messageId":"7vboa4n2mi.fsf@alter.siamese.dyndns.org","threadId":"33296","inReplyTo":"1364403956-20443-1-git-send-email-mihai@mihaic.ro","subject":"Re: [PATCH v2] Fixed typo in git-pull manual","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-27T18:01:25Z","receivedAt":"2013-03-27T18:01:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}