| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2005-09-25 | [PATCH] Finish documenting trivial merge rules | Daniel Barkalow | |
| 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> | |||
| 2005-09-11 | [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. | Daniel Barkalow | |
| Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net> | |||
Welcome to mirror list, hosted at ThFree Co, Russian Federation.
 |
index : git.kernel.org/pub/scm/git/git.git | |
| Unnamed repository; edit this file 'description' to name the repository. | root |
| summaryrefslogtreecommitdiff |