diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:59 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:35 -0700 |
| commit | aacb82de3ff8ae7b0a9e4cfec16c1807b6c315ef (patch) | |
| tree | f0d7c42d885f3eec2a693e110b8901f46f966491 /git-parse-remote.sh | |
| parent | merge-recursive: Save D/F conflict filenames instead of unlinking them (diff) | |
| download | tgif-aacb82de3ff8ae7b0a9e4cfec16c1807b6c315ef.tar.xz | |
merge-recursive: Split was_tracked() out of would_lose_untracked()
Checking whether a filename was part of stage 0 or stage 2 is code that we
would like to be able to call from a few other places without also
lstat()-ing the file to see if it exists in the working copy.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-parse-remote.sh')
0 files changed, 0 insertions, 0 deletions