From: Mihai Capotă Date: Wed, 27 Mar 2013 17:05:56 GMT Subject: [PATCH v2] Fixed typo in git-pull manual 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ă --- 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