author | Junio C Hamano <gitster@pobox.com> | |
Thu, 25 Nov 2010 00:00:35 +0000 (16:00 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 25 Nov 2010 00:00:35 +0000 (16:00 -0800) |
* jc/abbrev-guard:
core.abbrevguard: Ensure short object names stay unique a bit longer
core.abbrevguard: Ensure short object names stay unique a bit longer
1 | 2 | |||
---|---|---|---|---|
Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
cache.h | patch | | diff1 | | diff2 | | blob | history |
config.c | patch | | diff1 | | diff2 | | blob | history |
environment.c | patch | | diff1 | | diff2 | | blob | history |
sha1_name.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc environment.c
Simple merge
diff --cc sha1_name.c
Simple merge