diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-27 15:10:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 15:10:42 -0700 |
| commit | 09cfe6f8345e8ab347de8af492c34b5850b9b409 (patch) | |
| tree | 4951c518885be6106f89d4bdcdae363ef58ea7f9 /git-pull.txt | |
| parent | 712be266ef6a04f017013df37aeff94746e99943 (diff) | |
| download | git-htmldocs-09cfe6f8345e8ab347de8af492c34b5850b9b409.tar.gz | |
Autogenerated HTML docs for v1.8.2-242-g86177
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index c97574323..24ab07a3f 100644 --- a/git-pull.txt +++ b/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'. |