summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-14 16:15:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-14 16:15:43 (GMT)
commit0a9a787fca09878f993ad37c71a9646277222a6b (patch)
tree3d8649f52290902bd73974ea62f1cd44a192834c /upload-pack.c
parent94383a813570c254101ffd729dd8251db5fe8044 (diff)
parenta45fb697f13bb789aca930ce786cf416ef1ecd0e (diff)
downloadgit-0a9a787fca09878f993ad37c71a9646277222a6b.zip
git-0a9a787fca09878f993ad37c71a9646277222a6b.tar.gz
git-0a9a787fca09878f993ad37c71a9646277222a6b.tar.bz2
Merge branch 'ap/status-ignored-in-ignored-directory'
Output from "git status --ignored" showed an unexpected interaction with "--untracked". * ap/status-ignored-in-ignored-directory: status: always report ignored tracked directories git-status: Test --ignored behavior dir.c: Make git-status --ignored more consistent
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions