diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:42 -0700 |
| commit | 749086fa090d81c10ebf16b1abfd138c3fa0232e (patch) | |
| tree | a65d08d7e5f8f66a2f4cec1c1ad729db1ee3d183 | |
| parent | git-log: allow --decorate[=short|full] (diff) | |
| parent | Merge branch 'maint-1.6.2' into maint-1.6.3 (diff) | |
| download | tgif-749086fa090d81c10ebf16b1abfd138c3fa0232e.tar.xz | |
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3:
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
| -rw-r--r-- | Documentation/git-archive.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-gc.txt | 2 | ||||
| -rw-r--r-- | date.c | 2 | ||||
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index bc132c87e1..92444ddf10 100644 --- 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 b292e9843a..dcac8c8e29 100644 --- 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:: @@ -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 4f051942bd..2cb832753a 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -405,7 +405,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); |