user/sven/git.git/Documentation/technical, branch v1.0rc6 Git https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v1.0rc6 2005-12-13T07:55:09Z Documentation: fix missing links to git(7) 2005-12-13T07:55:09Z Junio C Hamano junkio@cox.net 2005-12-13T07:55:09Z urn:sha1:76cead391f77142f153ceafcb21ba50f0b09dd15 Also move pack protocol description to technical/. Signed-off-by: Junio C Hamano <junkio@cox.net> [PATCH] Finish documenting trivial merge rules 2005-09-25T05:05:55Z Daniel Barkalow barkalow@iabervon.org 2005-09-25T03:50:04Z urn:sha1:7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794 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. 2005-09-11T01:27:41Z Daniel Barkalow barkalow@iabervon.org 2005-09-05T06:05:17Z urn:sha1:3d89cb4f3f5333d5eb5899352566ad071dbd0d0c Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano <junkio@cox.net>