doc: drop author/documentation sections from most pages

diff --git a/cache.h b/cache.h
index 79723aac749ff1cd850b0933f188bd859885f8ec..d0bbc9120e33e96ad89a0d520b1da6359086c700 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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;
@@ -623,7 +622,7 @@ enum rebase_setup_type {
 enum push_default_type {
        PUSH_DEFAULT_NOTHING = 0,
        PUSH_DEFAULT_MATCHING,
-       PUSH_DEFAULT_TRACKING,
+       PUSH_DEFAULT_UPSTREAM,
        PUSH_DEFAULT_CURRENT
 };