diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:49 -0700 |
| commit | c49fd57bf472143b1a0bbfb246c91e6ea0f06887 (patch) | |
| tree | f2d6588d8302f18d43beb1e4f285f034e3c38513 /builtin/checkout.c | |
| parent | 269085e16e26d5096b5458ae89d63eb27de26eb7 (diff) | |
| parent | 4e55ed32db81d06a4f618e2cc0f9da0e223ae304 (diff) | |
| download | git-c49fd57bf472143b1a0bbfb246c91e6ea0f06887.tar.gz git-c49fd57bf472143b1a0bbfb246c91e6ea0f06887.tar.xz | |
Merge branch 'et/add-chmod-x'
"git update-index --add --chmod=+x file" may be usable as an escape
hatch, but not a friendly thing to force for people who do need to
use it regularly. "git add --chmod=+x file" can be used instead.
* et/add-chmod-x:
add: add --chmod=+x / --chmod=-x options
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 3398c61e9..c3486bdec 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -548,7 +548,7 @@ static int merge_working_tree(const struct checkout_opts *opts, * entries in the index. */ - add_files_to_cache(NULL, NULL, 0); + add_files_to_cache(NULL, NULL, 0, 0); /* * NEEDSWORK: carrying over local changes * when branches have different end-of-line |