aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-10 12:31:42 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-10 12:31:42 -0800
commit7b2ac7ee9ec19b8f9302a776b7274faee66e9b64 (patch)
treef6a567c0c0d5e89aceb8d223d39172eabd937bb4 /builtin-merge.c
parentMerge branch 'jk/gitignore-anchored' (diff)
parentpush: always load default config (diff)
downloadgit-7b2ac7ee9ec19b8f9302a776b7274faee66e9b64.tar.gz
git-7b2ac7ee9ec19b8f9302a776b7274faee66e9b64.zip
Merge branch 'jk/maint-push-config'
* jk/maint-push-config: push: always load default config
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions