3 Commits (c6f5a7a916b36fc9dd00bb6dce3b68260579abe1)

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. 20 years ago
Jon Loeliger bb73d73c08 Refactor merge strategies into separate includable file. 20 years ago