Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx> writes: > Commit 8f323c00 (drop support for GIT_CONFIG_NOGLOBAL, 15-03-2011) > removed the git_config_global() function, among other things, since > it is no longer required. Unfortunately, this function has since > been unintentionally restored; I suspect by merge commit 25b86e45 > (Merge branch 'jk/maint-config-alias-fix' into next, 25-05-2011). Yeah, I think it was 1f9a980636 which was a merge between fb674d7 and 73546c0. I just compared the output between these two: $ git diff fb674d7...73546c0 -- config.c ;# what the topic did $ git diff fb674d7 1f9a980 -- config.c ;# what was merged and indeed I can see these four lines snuck in by accidental faulty conflict resolution. My bad. Thanks for spotting. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html