diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:48 -0700 |
| commit | bcd5461a35c2cb876efc9eb9f66505336ecb192f (patch) | |
| tree | 9ac7a616fa198874af9b85ece5e9c945183cdfce | |
| parent | 1e239079f704b840778c263f35f1e299565d4a49 (diff) | |
| parent | 5d2c3b01604a170c52262bf2751c55053d6bd8c1 (diff) | |
| download | git-bcd5461a35c2cb876efc9eb9f66505336ecb192f.tar.gz | |
Merge branch 'js/rerere-forget-always-take-pathspec'
* js/rerere-forget-always-take-pathspec:
rerere forget: deprecate invocation without pathspec
| -rw-r--r-- | Documentation/git-rerere.txt | 4 | ||||
| -rw-r--r-- | builtin/rerere.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 161ecad2a9..52db1d80cf 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'|'forget' [<pathspec>]|'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc'] DESCRIPTION ----------- @@ -43,7 +43,7 @@ will automatically invoke this command. 'forget' <pathspec>:: This resets the conflict resolutions which rerere has recorded for the current -conflict in <pathspec>. The <pathspec> is optional. +conflict in <pathspec>. 'diff':: diff --git a/builtin/rerere.c b/builtin/rerere.c index 67cbfeb152..82358855d1 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -8,7 +8,7 @@ #include "xdiff-interface.h" static const char * const rerere_usage[] = { - "git rerere [clear | status | remaining | diff | gc]", + "git rerere [clear | forget path... | status | remaining | diff | gc]", NULL, }; @@ -136,7 +136,10 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) return rerere(flags); if (!strcmp(argv[0], "forget")) { - const char **pathspec = get_pathspec(prefix, argv + 1); + const char **pathspec; + if (argc < 2) + warning("'git rerere forget' without paths is deprecated"); + pathspec = get_pathspec(prefix, argv + 1); return rerere_forget(pathspec); } |