| commit | d011ab4312a8ddabd143567fa9706b8e9fb9c0a4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 17:51:10 +0000 (27 10:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Mar 2013 17:51:10 +0000 (27 10:51 -0700) | ||
| tree | a7167cc0ece6125ff59ba1fc6ae78119f863017d | treesnapshot (tar.gz zip) |
| parent | 3bbbf18d711eb8fe3390580963c1a071e03cbb38 | commitdiff |
| parent | 187c00c6c58ba8916a37011b56cb0cb8f2dd1805 | commitdiff |
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)
* 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)
| Documentation/git-commit.txt | diff1 | diff2 | blobhistory |
| Documentation/git-pull.txt | diff1 | diff2 | blobhistory |