Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Documentation: fix missing links to git(7) | Junio C Hamano | 2005-12-12 | 1 | -0/+41 |
| | | | | | | Also move pack protocol description to technical/. Signed-off-by: Junio C Hamano <junkio@cox.net> | ||||
* | [PATCH] Finish documenting trivial merge rules | Daniel Barkalow | 2005-09-24 | 1 | -10/+39 |
| | | | | | | | | 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 | 1 | -0/+92 |
Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net> |