Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
Fix overridable written with an extra 'e'
Documentation: git-archive: mark --format as optional in summary
Round-down years in "years+months" relative date view

Conflicts:
Documentation/git-archive.txt

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index bc132c87e1a5b9f42ea1f2bbd4e3c46f67fc3852..92444ddf10081ee5faccd28491b47ef1cb45deee 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -9,7 +9,7 @@ git-archive - Create an archive of files from a named tree
 SYNOPSIS
 --------
 [verse]
-'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
              [--output=<file>] [--worktree-attributes]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index b292e9843aa9da86cd44bd07d3ce35053be32177..dcac8c8e2970c23454f206321292583945ede8c5 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -61,7 +61,7 @@ automatic consolidation of packs.
 
 --prune=<date>::
        Prune loose objects older than date (default is 2 weeks ago,
-       overrideable by the config variable `gc.pruneExpire`).  This
+       overridable by the config variable `gc.pruneExpire`).  This
        option is on by default.
 
 --no-prune::

diff --git a/date.c b/date.c
index 409a17d46424083b62f21e7e278393cee7bfa080..f011692c2f9f06e2356c2256ff8f1b496a1af2d5 100644 (file)
--- a/date.c
+++ b/date.c
@@ -135,7 +135,7 @@ const char *show_date(unsigned long time, int tz, enum date_mode mode)
                }
                /* Give years and months for 5 years or so */
                if (diff < 1825) {
-                       unsigned long years = (diff + 183) / 365;
+                       unsigned long years = diff / 365;
                        unsigned long months = (diff % 365 + 15) / 30;
                        int n;
                        n = snprintf(timebuf, sizeof(timebuf), "%lu year%s",

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3f99361ed03b8d5202cb17e894c65678364fc1ed..6f355d80699dabc315cec5a6eaea133ca55c3e6f 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -376,7 +376,7 @@ sub gitweb_get_feature {
                @{$feature{$name}{'default'}});
        if (!$override) { return @defaults; }
        if (!defined $sub) {
-               warn "feature $name is not overrideable";
+               warn "feature $name is not overridable";
                return @defaults;
        }
        return $sub->(@defaults);