aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-17 13:03:52 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-17 13:03:52 -0700
commite845e16ee6de99a203db47eeb840daf3b1914ec9 (patch)
tree6881244e543cbf5b17cb31a8b8512fa758a608b5 /builtin-fetch.c
parentMerge branch 'maint' (diff)
parentrefactor handling of "other" files in ls-files and status (diff)
downloadgit-e845e16ee6de99a203db47eeb840daf3b1914ec9.tar.gz
git-e845e16ee6de99a203db47eeb840daf3b1914ec9.zip
Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
* jk/maint-ls-files-other: refactor handling of "other" files in ls-files and status Conflicts: read-cache.c
Diffstat (limited to 'builtin-fetch.c')
0 files changed, 0 insertions, 0 deletions