projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0e8c092 3c3e6f5)
Merge branch 'rr/doc-merge-strategies'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:23 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:23 +0000 (11:08 -0700)
commit3e33860aa1c39429ebfe2542adf9011bd2c9aeba
treeeac628f0199b0cf69f804bf74729ebce129da1a9tree | snapshot
parent0e8c09263e87c548de006cdb6af035d42f845087commit | diff
parent3c3e6f5645c5e661bc8c338e4e7a9252a14e429ecommit | diff
Merge branch 'rr/doc-merge-strategies'

* rr/doc-merge-strategies:
  Documentation/merge-strategies: avoid hyphenated commands
Documentation/merge-strategies.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.