| commit | 8617715cc09b7422fe31189f9476f6ade73ede70 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 17:58:07 +0000 (27 10:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 17:58:07 +0000 (27 10:58 -0700) | ||
| tree | 7c62d215a31c9e990753b2bc1e8aee1870f06c4c | treesnapshot (tar.gz zip) |
| parent | ccf23370aacf01111eebdee196da10d4e61a6be4 | commitdiff |
| parent | 9a82efd0d2a2727507bd908d7f0545437fcc0ff6 | commitdiff |
Merge branch 'maint'
* maint:
More fixes for 1.8.2.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)
* maint:
More fixes for 1.8.2.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)
| Documentation/git-commit.txt | diff1 | diff2 | blobhistory |