diff options
| author |  Mihai Capotă <mihai@mihaic.ro> | 2013-03-27 12:04:51 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-27 09:30:54 -0700 |
| commit | 38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8 (patch) | |
| tree | f58fec05f8413290bca1e78b87643ae36204f4d5 /Documentation | |
| parent | Correct the docs about GIT_SSH. (diff) | |
| download | tgif-38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8.tar.xz | |
git-pull doc: fix grammo ("conflicts" is plural)
Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 67fa5ee195..638456b68c 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'. |