undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,000 Commits 1 Branch 0 Tags 217 MiB
41a5c70f2c
Commit Graph

53 Commits

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