diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-10 22:45:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-10 22:45:49 -0800 |
| commit | adfe4e1ff2c296184856bf55636be845f96b55e5 (patch) | |
| tree | ca672bed6ea60d2b3fdc9454f75b03e52472063c /cache.h | |
| parent | Update Release Notes to 1.7.5 (diff) | |
| parent | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" (diff) | |
| download | tgif-adfe4e1ff2c296184856bf55636be845f96b55e5.tar.xz | |
Merge branch 'maint'
* maint:
Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -560,7 +560,6 @@ extern int assume_unchanged; extern int prefer_symlink_refs; extern int log_all_ref_updates; extern int warn_ambiguous_refs; -extern int unique_abbrev_extra_length; extern int shared_repository; extern const char *apply_default_whitespace; extern const char *apply_default_ignorewhitespace; |