git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccf2337 9a82efd)
Merge branch 'maint'
authorJunio C Hamano <redacted>
Wed, 27 Mar 2013 17:58:07 +0000 (10:58 -0700)
committerJunio C Hamano <redacted>
Wed, 27 Mar 2013 17:58:07 +0000 (10:58 -0700)
* 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)

1  2 
Documentation/git-commit.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-commit.txt
Simple merge
git clone https://git.99rst.org/PROJECT