Re: [PATCH 1/2] read-tree: further loosen "working file will be lost" check.
flat view
From: Jakub Narebski <hidden>
Date: 2016-08-11 20:34:13
Junio C Hamano wrote:
A new option "--ignore=.gitignore" can be used to tell the "git-read-tree" command that the user does not mind losing contents in untracked files in the working tree if it needs to be overwritten by a merge (either a two-way "switch branch" merge, or a three-way merge).
[...]
builtin-read-tree.c | 20 ++++++++++ dir.c | 4 +- dir.h | 3 ++ t/t1004-read-tree-m-u-wf.sh | 82 ++++++++++++++++++++++++++++++++++++++---- unpack-trees.c | 24 ++++++++++--- unpack-trees.h | 1 + 6 files changed, 119 insertions(+), 15 deletions(-)
Documentation, please? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git