Clemens Buchacher <drizzd@xxxxxx> writes:
> Documentation/config.txt | 6 ++++++
> builtin/checkout.c | 7 +++++++
> builtin/merge.c | 9 +++++++++
> cache.h | 1 +
> config.c | 3 +++
> environment.c | 1 +
> 6 files changed, 27 insertions(+), 0 deletions(-)
You forgot to update Documentation/git-checkout.txt and
Documentation/git-merge.txt with the new '-i' option.
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 5affb6f..121a6a3 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -664,6 +669,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
> OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage",
> 3),
> OPT_BOOLEAN('f', "force", &opts.force, "force"),
> + OPT_BOOLEAN('i', "overwrite-ignored", &overwrite_ignored,
> + "allow explicitly ignored files to be overwritten"),
> OPT_BOOLEAN('m', "merge", &opts.merge, "merge"),
> OPT_STRING(0, "conflict", &conflict_style, "style",
> "conflict style (merge or diff3)"),
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 4d31e09..47b12ba 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -185,6 +185,8 @@ static struct option builtin_merge_options[] = {
> "allow fast-forward (default)"),
> OPT_BOOLEAN(0, "ff-only", &fast_forward_only,
> "abort if fast-forward is not possible"),
> + OPT_BOOLEAN('i', "overwrite-ignored", &overwrite_ignored,
> + "allow explicitly ignored files to be overwritten"),
> OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
> OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
> "merge strategy to use", option_parse_strategy),
--
Jakub Narebski
Poland
ShadeHawk on #git
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html