]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c2bec9 5f737ac)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2013 20:53:48 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2013 20:53:48 +0000 (13:53 -0700)
* maint:
  git-merge: document the -S option


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.