git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c7d0cc 3c3e6f5)
Merge branch 'rr/doc-merge-strategies' into maint
authorJunio C Hamano <redacted>
Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700)
committerJunio C Hamano <redacted>
Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700)
* rr/doc-merge-strategies:
  Documentation/merge-strategies: avoid hyphenated commands

1  2 
Documentation/merge-strategies.txt patch | diff1 | diff2 | blob | history

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