projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c3bc895) | patch
[PATCH] Finish documenting trivial merge rules
authorDaniel Barkalow <barkalow@iabervon.org>
Sun, 25 Sep 2005 03:50:04 +0000 (23:50 -0400)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 05:05:55 +0000 (22:05 -0700)
commit7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794
tree572ada7f126f8bfad8a9fb914d2f85d4a82c6b35tree | snapshot
parentc3bc895c81b6ec6906be7e6739edb4a50eecf6e9commit | diff
[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>
Documentation/technical/trivial-merge.txt diff | blob | history
The core git plumbing