projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a51e4b a45fb69)
Merge branch 'ap/status-ignored-in-ignored-directory' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:10:25 +0000 (11:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:10:25 +0000 (11:10 -0800)
commit85fd059a89c7328ca37edd31f2d8daa4d0d61de5
treeaf771f6556d0a225b171878719f67ceb0c02031dtree | snapshot
parent3a51e4be9c3910ce0b81de5eb1b7f4a16994fc78commit | diff
parenta45fb697f13bb789aca930ce786cf416ef1ecd0ecommit | diff
Merge branch 'ap/status-ignored-in-ignored-directory' into maint

Output from "git status --ignored" did not work well when used 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