summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-28 11:10:25 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-28 11:10:25 -0800
commit85fd059a89c7328ca37edd31f2d8daa4d0d61de5 (patch)
treeaf771f6556d0a225b171878719f67ceb0c02031d /git-rebase--am.sh
parent3a51e4be9c3910ce0b81de5eb1b7f4a16994fc78 (diff)
parenta45fb697f13bb789aca930ce786cf416ef1ecd0e (diff)
downloadgit-85fd059a89c7328ca37edd31f2d8daa4d0d61de5.tar.gz
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
Diffstat (limited to 'git-rebase--am.sh')
0 files changed, 0 insertions, 0 deletions