development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/rerere-forget-always-take-pathspec'

Browse source 
* js/rerere-forget-always-take-pathspec:
  rerere forget: deprecate invocation without pathspec
This commit is contained in:
Junio C Hamano 2011-03-19 23:24:48 -07:00
parent 1e239079f7 5d2c3b0160
commit bcd5461a35
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/git-rerere.txt
View file

@ -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'::

7
builtin/rerere.c
View file

@ -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);
}