I just discovered the git config includeIf and also that SmartGit still does not support it.

I almost always use SmartGit for git operations and being able to use includeIf in my global .gitconfig as described above would really help and prevent commits with the wrong email which has happened in the past.

I see, that makes sense, choice and configurability is good. (and I don't know what I was thinking about only staged files showing in the working tree, that doesn't make any sense).

Interesting. So would/should the pseudo Working Tree and Index commits exist if there is nothing in them?

Does the Working Tree include uncommitted and missing files and modified files or only staged files?

I don't currently have an opinion, I'm curious about other people's thoughts and rationales.

It's there and it works, thanks, I didn't realize it was behind that door :-)

Is that option available on all OSs? I'm not seeing it. (running linux w/ KDE)

I would even appreciate the warning every time it appears that the origin branch had been rebased, with the option to continue w/ the pull (and merge or rebase as configured) or to just stop after the fetch, allowing me to manually do the rebase, or decide to reset and perhaps cherry pick as seems appropriate.