kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
3,748 Commits
6 Branches
991 Tags
172 MiB
Commit Graph

3 Commits (aa1dbc9897822c8acb284b35c40da60f3debca91)

Author SHA1 Message Date
Junio C Hamano 76cead391f Documentation: fix missing links to git(7) 
Also move pack protocol description to technical/.

Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-12-12 23:55:09 -08:00
Daniel Barkalow 7061f5c2c5 [PATCH] Finish documenting trivial merge rules 
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-24 22:05:55 -07:00
Daniel Barkalow 3d89cb4f3f [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. 
Signed-off-by: Daniel Barkalow
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-10 18:27:41 -07:00