summaryrefslogtreecommitdiff
path: root/usage.c
diff options
context:
space:
mode:
authorLibravatar Jakub Narebski <jnareb@gmail.com>2007-05-26 00:37:39 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-25 20:54:38 -0700
commitc1bab2889eb71bf537497fc77a2fdb6a74bc92e6 (patch)
tree88e164164b9917e2f0c3aae3f6c317ed1488b6c5 /usage.c
parentReplace the last 'dircache's by 'index' (diff)
downloadtgif-c1bab2889eb71bf537497fc77a2fdb6a74bc92e6.tar.xz
Documentation: Add definition of "evil merge" to GIT Glossary
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'usage.c')
0 files changed, 0 insertions, 0 deletions