diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-27 17:51:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 17:51:10 (GMT) |
| commit | d011ab4312a8ddabd143567fa9706b8e9fb9c0a4 (patch) | |
| tree | a7167cc0ece6125ff59ba1fc6ae78119f863017d /Documentation/git-pull.txt | |
| parent | 3bbbf18d711eb8fe3390580963c1a071e03cbb38 (diff) | |
| parent | 187c00c6c58ba8916a37011b56cb0cb8f2dd1805 (diff) | |
| download | git-d011ab4312a8ddabd143567fa9706b8e9fb9c0a4.zip git-d011ab4312a8ddabd143567fa9706b8e9fb9c0a4.tar.gz git-d011ab4312a8ddabd143567fa9706b8e9fb9c0a4.tar.bz2 | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
merge-tree: fix typo in merge-tree.c::unresolved
git-commit doc: describe use of multiple `-m` options
git-pull doc: fix grammo ("conflicts" is plural)
Diffstat (limited to 'Documentation/git-pull.txt')
| -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 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'. |