diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-14 11:55:32 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-14 11:55:32 +0400 |
| commit | 611d8139e4e0a78797a0821074fc94a4f8d74b7b (patch) | |
| tree | 992e3bebcce5faf2dc81e3dd7b6df84ade69b477 /builtin-add.c | |
| parent | 568d2cde9b9fe0fc6b3202c7987b13289cb1a4a0 (diff) | |
| parent | 8419d2ee9ba8b375186a5c1019df8dfbce610aba (diff) | |
Merge branch 'maint'
* maint:
git-format-patch --in-reply-to: accept <message@id> with angle brackets
git-add -u: do not barf on type changes
Remove duplicate note about removing commits with git-filter-branch
git-clone: improve error message if curl program is missing or not executable
hooks--update: Explicitly check for all zeros for a deleted ref.
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-add.c b/builtin-add.c index 105a9f0e1f..9847b7e019 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -98,6 +98,7 @@ static void update_callback(struct diff_queue_struct *q, die("unexpacted diff status %c", p->status); case DIFF_STATUS_UNMERGED: case DIFF_STATUS_MODIFIED: + case DIFF_STATUS_TYPE_CHANGED: add_file_to_cache(path, verbose); break; case DIFF_STATUS_DELETED: |