projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3402f1d) | patch
Refactor merge strategies into separate includable file.
authorJon Loeliger <jdl@freescale.com>
Sun, 6 Nov 2005 16:26:07 +0000 (10:26 -0600)
committerJunio C Hamano <junkio@cox.net>
Sun, 6 Nov 2005 18:31:48 +0000 (10:31 -0800)
commitbb73d73c0885fce357e0d70aa51c2215a8e38a4e
treefef586ef93089ddb1088c003cb84cafa8ba3c81btree | snapshot
parent3402f1d6a3d8f4205fe59286e3a1223a9d28aea6commit | diff
Refactor merge strategies into separate includable file.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge.txt diff | blob | history
Documentation/git-pull.txt diff | blob | history
Documentation/merge-strategies.txt [new file with mode: 0644] blob
The core git plumbing