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 /environment.c | |
| 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 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/environment.c b/environment.c index 9564475f42..c3efbb9608 100644 --- a/environment.c +++ b/environment.c @@ -21,7 +21,6 @@ int prefer_symlink_refs; int is_bare_repository_cfg = -1; /* unspecified */ int log_all_ref_updates = -1; /* unspecified */ int warn_ambiguous_refs = 1; -int unique_abbrev_extra_length; int repository_format_version; const char *git_commit_encoding; const char *git_log_output_encoding; |