summaryrefslogtreecommitdiff
path: root/Documentation/git-init-db.txt
diff options
context:
space:
mode:
authorLibravatar Daniel Barkalow <barkalow@iabervon.org>2005-09-24 23:50:04 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2005-09-24 22:05:55 -0700
commit7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794 (patch)
tree572ada7f126f8bfad8a9fb914d2f85d4a82c6b35 /Documentation/git-init-db.txt
parentRemove use of 'xargs -0' from git-reset. (diff)
downloadtgif-7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794.tar.xz
[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>
Diffstat (limited to 'Documentation/git-init-db.txt')
0 files changed, 0 insertions, 0 deletions