Elijah Newren writes:
> +--index-only::
> + Perform merge on index only, leaving working tree alone. Most
> + users do NOT want to use this flag, as it will leave the
> + working tree and the index completely out of sync, which is
> + very likely to confuse users and prevent a su
Subsequent commits will add implementation for each relevant merge strategy
Signed-off-by: Elijah Newren
---
Documentation/git-merge.txt | 14 ++
builtin/merge.c | 7 +++
git.c | 2 +-
merge-recursive.c | 1 +
merge-recursive.h
2 matches
Mail list logo
