aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical
Commit message (Collapse)AuthorAge
* Documentation: fix missing links to git(7)Junio C Hamano2005-12-12
| | | | | | Also move pack protocol description to technical/. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Finish documenting trivial merge rulesDaniel Barkalow2005-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 Barkalow2005-09-10
Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net>