diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:05:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:05:22 -0700 |
| commit | 1c6e3514d093377fec5e30aa02a119187cf743f2 (patch) | |
| tree | fe3865b32c4690dce137a173d86f3876578cf02c /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'jc/fmt-req-fix' into maint (diff) | |
| parent | handle_options(): do not miscount how many arguments were used (diff) | |
| download | tgif-1c6e3514d093377fec5e30aa02a119187cf743f2.tar.xz | |
Merge branch 'jk/maint-config-alias-fix' into maint
* 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
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions