diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-04 16:00:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-05 23:25:52 -0800 |
| commit | f8a9d4287277ed15d3f0d61004f4510c59f1f392 (patch) | |
| tree | b3a75baf61f97d601d2e4d7cf79c8399b902d9bf /builtin-push.c | |
| parent | Document git-diff whitespace flags -b and -w (diff) | |
| download | tgif-f8a9d4287277ed15d3f0d61004f4510c59f1f392.tar.xz | |
read-tree: further loosen "working file will be lost" check.
This follows up commit ed93b449 where we removed overcautious
"working file will be lost" check.
A new option "--exclude-per-directory=.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 they
need to be overwritten by a merge (either a two-way "switch
branches" merge, or a three-way merge).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-push.c')
0 files changed, 0 insertions, 0 deletions