only count untracked files
make gitk show the relevant branches

also use long form