Merge branch 'maint'
authorJunio C Hamano <redacted>
Fri, 18 Oct 2013 20:53:48 +0000 (13:53 -0700)
committerJunio C Hamano <redacted>
Fri, 18 Oct 2013 20:53:48 +0000 (13:53 -0700)
* maint:
  git-merge: document the -S option


Trivial merge
git clone https://git.99rst.org/PROJECT