From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Oct 2013 20:53:48 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.5-rc0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82c41a9bfc843aa2a6e286bcb917b0436714ebd4;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  git-merge: document the -S option
---

82c41a9bfc843aa2a6e286bcb917b0436714ebd4