From 66bd8ab899d442926ad45d63cd5ad63ab5bb81b2 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Wed, 30 Jun 2010 13:41:27 -0700 Subject: Documentation/git-gc.txt: add reference to githooks This advertises the existence of the 'pre-auto-gc' hook and adds a cross reference to where the hook is documented. Signed-off-by: Chris Packham Signed-off-by: Junio C Hamano diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 189573a..cbe74d5 100644 --- a/Documentation/git-gc.txt +++ b/Documentation/git-gc.txt @@ -127,6 +127,13 @@ If you are expecting some objects to be collected and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references. +HOOKS +----- + +The 'git gc --auto' command will run the 'pre-auto-gc' hook. See +linkgit:githooks[5] for more information. + + SEE ALSO -------- linkgit:git-prune[1] -- cgit v0.10.2-6-g49f6 From 2c64034491e302fa12ac86365dd872d9a75dc855 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 5 Jul 2010 15:15:20 +0200 Subject: rerere.txt: Document forget subcommand dea4562 (rerere forget path: forget recorded resolution, 2009-12-25) introduced the forget subcommand for rerere. Document it. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index acc220a..db99d47 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS -------- -'git rerere' ['clear'|'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' []|'diff'|'status'|'gc'] DESCRIPTION ----------- @@ -40,6 +40,11 @@ This resets the metadata used by rerere if a merge resolution is to be aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will automatically invoke this command. +'forget' :: + +This resets the conflict resolutions which rerere has recorded for the current +conflict in . The is optional. + 'diff':: This displays diffs for the current state of the resolution. It is -- cgit v0.10.2-6-g49f6 From 6b097788f88a29d6e171af7a9e87117cf992e833 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 4 Jul 2010 06:48:35 -0400 Subject: t0006: test timezone parsing Previously, test-date simply ignored the parsed timezone and told show_date() to use UTC. Instead, let's print out what we actually parsed. While we're at it, let's make it easy for tests to work in a specific timezone. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 75b02af..3ea4f9e 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -28,8 +28,8 @@ check_show 31449600 '12 months ago' check_parse() { echo "$1 -> $2" >expect - test_expect_${3:-success} "parse date ($1)" " - test-date parse '$1' >actual && + test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" " + TZ=${3:-$TZ} test-date parse '$1' >actual && test_cmp expect actual " } @@ -38,6 +38,7 @@ check_parse 2008 bad check_parse 2008-02 bad check_parse 2008-02-14 bad check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000' +check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' check_approxidate() { echo "$1 -> $2 +0000" >expect diff --git a/test-date.c b/test-date.c index a9e705f..ac6854a 100644 --- a/test-date.c +++ b/test-date.c @@ -21,12 +21,15 @@ static void parse_dates(char **argv, struct timeval *now) for (; *argv; argv++) { char result[100]; time_t t; + int tz; result[0] = 0; parse_date(*argv, result, sizeof(result)); - t = strtoul(result, NULL, 0); - printf("%s -> %s\n", *argv, - t ? show_date(t, 0, DATE_ISO8601) : "bad"); + if (sscanf(result, "%ld %d", &t, &tz) == 2) + printf("%s -> %s\n", + *argv, show_date(t, tz, DATE_ISO8601)); + else + printf("%s -> bad\n", *argv); } } -- cgit v0.10.2-6-g49f6