diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-29 18:32:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-01 13:26:05 -0700 |
| commit | 20314271679e169f324c118c69c8d9e0399feec9 (patch) | |
| tree | 768123d50c0cd78bfaf9eaa743e5ed557cade82c /blob.c | |
| parent | a44c4267090366c81303b964ab64f3d51b78f885 (diff) | |
| download | git-20314271679e169f324c118c69c8d9e0399feec9.tar.gz | |
git add: respect core.filemode with unmerged entries
When a merge left unmerged entries, git add failed to pick up the
file mode from the index, when core.filemode == 0. If more than one
unmerged entry is there, the order of stage preference is 2, 1, 3.
Noticed by Johannes Sixt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'blob.c')
0 files changed, 0 insertions, 0 deletions