| commit | 82c41a9bfc843aa2a6e286bcb917b0436714ebd4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Oct 2013 20:53:48 +0000 (18 13:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Oct 2013 20:53:48 +0000 (18 13:53 -0700) | ||
| tree | feaa3599c95da8400b179a5618443c66125ee3c6 | treesnapshot (tar.gz zip) |
| parent | 6c2bec96a8215bad7745d559c631e45332c5a9ee | commitdiff |
| parent | 5f737ac91bd869e65bff401ad1108581ac504e22 | commitdiff |
Merge branch 'maint'
* maint:
git-merge: document the -S option
* maint:
git-merge: document the -S option