diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-30 20:19:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-30 20:19:14 -0700 |
| commit | 1f9a980636d39c08c1cf1c13a6e6584d9d039e0e (patch) | |
| tree | 97f906828fd6ad4166101e7e5d86a7a4b9671079 /builtin/diff.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | handle_options(): do not miscount how many arguments were used (diff) | |
| download | tgif-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 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions