diff options
| author | Thomas Rast <trast@inf.ethz.ch> | 2013-10-26 16:43:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-05 10:35:20 -0800 |
| commit | 729bbcea374f7171a4dafd995992d3c1aa525cda (patch) | |
| tree | 33e76b698c9730dd342b2d029988a64c9145a729 /merge-recursive.c | |
| parent | 5ac920e96bb6145532f094cbf765a87d2dbe1251 (diff) | |
| download | git-tr/merge-recursive-index-only.tar.gz | |
merge-recursive: -Xindex-only to leave worktree unchangedtr/merge-recursive-index-only
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 35be1441db..f59c1d399f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2096,6 +2096,8 @@ int parse_merge_opt(struct merge_options *o, const char *s) if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0) return -1; } + else if (!strcmp(s, "index-only")) + o->no_worktree = 1; else return -1; return 0; |