git-config

I have two related questions: How can I determine precisely which config file is being used by my Git bash client? Can I override settings in the config file being used? I know that there is a system, global and local (aka project) .gitconfig file. And, according to the Git site , each of these "levels" (system, global, local) overwrites values in the previous level, so values in the ./git/config (local) trump those in /etc/gitconfig , for instance. In other words we are dealing with a hierarchy and any declaration in the local config file will take precedence over one in the global or system

I have editor settings that I want to spread in all repositories. If the user defines its own settings, it should erase the repository choices of course. I want to do that because I have a class and every student clone the repo. Usually they forget to set the core.editor setting and ends up messing around with vi, usually crashing the repo just like if they have cursed magical power. As it worked for my HOME dir, I tried to use a .gitconfig in my repo dir, like I would set a .gitignore, but it doesn't seem to work. EDIT : --global DOES let the user set its preference to override the repo, but

This question already has answers here : Closed 7 years ago . Possible Duplicate: Is it possible to include a file in your .gitconfig With bash and zsh I can source subfiles in order to better organize my config. Can I do something similar with .gitconfig ? (March 2012) It looks like this is finally going to be possible soon -- git 1.7.10 is going to support this syntax in .gitconfig : [include] path = /path/to/file See here for a detailed description of the git change and its edge cases. By the way, a couple of subtleties worth pointing out: Path expansion, e.g. ~ or $HOME , does not appear

git add --patch provides a great interface for reviewing unstaged changes and then staging only the ones that are wanted in the next commit. Great, except for one thing: there is no obvious way to choose which diff view to use. In particular, I would like to be able to configure git add --patch to present diffs to me the same way that git diff --word-diff does. How can I achieve that? (N.B. neither --word-diff nor --word-diff --color is exactly the same as --color-words , and so this question (and its answer ) are different to this question and its answers. However, that question's answers are

I am trying to configure DiffMerge as my difftool in Git but having no luck. This is the revelent section of my .gitconfig file (the other settings not shown are just for the user). [diff] tool = diffmerge [difftool "diffmerge"] cmd = \"C:\\Program Files\\SourceGear\\Common\\DiffMerge\\sgdm.exe\" \"$LOCAL\" \"$REMOTE\" Whenever I call git difftool from the powershell command line the conflicts are shown directly beneath in the powershell interface, not in diffmerge as intended. I know the settings are being picked up by git because when I inspect the global config I am given the settings from