3 Commits (afc72747049af5775ab9def6224dd8082d42a57f)

Author SHA1 Message Date
Miklos Vajna 02b00e16bb Documentation/git-merge: document subtree strategy. 17 years ago
Junio C Hamano 9688a882e1 Documentation: recursive is the default strategy these days. 19 years ago
Jon Loeliger bb73d73c08 Refactor merge strategies into separate includable file. 19 years ago