projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 94383a8 a45fb69)
Merge branch 'ap/status-ignored-in-ignored-directory'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:15:40 +0000 (08:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:15:43 +0000 (08:15 -0800)
commit0a9a787fca09878f993ad37c71a9646277222a6b
tree3d8649f52290902bd73974ea62f1cd44a192834ctree | snapshot
parent94383a813570c254101ffd729dd8251db5fe8044commit | diff
parenta45fb697f13bb789aca930ce786cf416ef1ecd0ecommit | 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
dir.c diff1 | diff2 | blob | history
wt-status.c diff1 | diff2 | blob | history
Git—the stupid content tracker