summaryrefslogtreecommitdiff
path: root/contrib/continuous/cidaemon
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 20:19:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 20:19:14 -0700
commit1f9a980636d39c08c1cf1c13a6e6584d9d039e0e (patch)
tree97f906828fd6ad4166101e7e5d86a7a4b9671079 /contrib/continuous/cidaemon
parentMerge branch 'maint' (diff)
parenthandle_options(): do not miscount how many arguments were used (diff)
downloadtgif-1f9a980636d39c08c1cf1c13a6e6584d9d039e0e.tar.xz
Merge branch 'jk/maint-config-alias-fix'
* jk/maint-config-alias-fix: handle_options(): do not miscount how many arguments were used config: always parse GIT_CONFIG_PARAMETERS during git_config git_config: don't peek at global config_parameters config: make environment parsing routines static Conflicts: config.c
Diffstat (limited to 'contrib/continuous/cidaemon')
0 files changed, 0 insertions, 0 deletions