diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2008-01-08 14:45:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-08 16:17:44 -0800 |
| commit | 87e3d812943f3d9c5f9464b0aee83398dd9d028e (patch) | |
| tree | f1268cfea69e4e753658b9eec596f0d64c83bd31 /merge-index.c | |
| parent | d8c3794503553c22330f46ed4c0e70a6613d2f65 (diff) | |
| download | git-87e3d812943f3d9c5f9464b0aee83398dd9d028e.tar.gz | |
git.el: Make sure we never insert the same file twice.
Skip non-zero stage files during git-ls-files -c, they are handled
later. Also fix git-insert-info-list to merge duplicate file names.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions