| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | git merge -X<option> | Avery Pennarun | 2010-01-17 |
| | | | | | | | | | | Teach "-X <option>" command line argument to "git merge" that is passed to strategy implementations. "ours" and "theirs" autoresolution introduced by the previous commit can be asked to the recursive strategy. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | ||
| * | merge-recursive: split low-level merge functions out. | Junio C Hamano | 2008-02-18 |
| This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/ll-merge.h