| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | [PATCH] Finish documenting trivial merge rules | Daniel Barkalow | 2005-09-24 |
| | | | | | | | | | Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | ||
| * | [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. | Daniel Barkalow | 2005-09-10 |
| Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net> | |||
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |