diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-14 20:15:40 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-14 20:15:43 +0400 |
| commit | 0a9a787fca09878f993ad37c71a9646277222a6b (patch) | |
| tree | 3d8649f52290902bd73974ea62f1cd44a192834c /upload-pack.c | |
| parent | 94383a813570c254101ffd729dd8251db5fe8044 (diff) | |
| parent | a45fb697f13bb789aca930ce786cf416ef1ecd0e (diff) | |
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