diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:19:16 -0700 |
| commit | f946b465d7fa13a235dd5653d37c7babb1ceb233 (patch) | |
| tree | d3a1aa2e6f0779e5440cec0815f0d59d9e31b4d4 /t/t4034 | |
| parent | Merge branch 'mh/attr' (diff) | |
| parent | want_color: automatically fallback to color.ui (diff) | |
| download | tgif-f946b465d7fa13a235dd5653d37c7babb1ceb233.tar.xz | |
Merge branch 'jk/color-and-pager'
* jk/color-and-pager:
want_color: automatically fallback to color.ui
diff: don't load color config in plumbing
config: refactor get_colorbool function
color: delay auto-color decision until point of use
git_config_colorbool: refactor stdout_is_tty handling
diff: refactor COLOR_DIFF from a flag into an int
setup_pager: set GIT_PAGER_IN_USE
t7006: use test_config helpers
test-lib: add helper functions for config
t7006: modernize calls to unset
Conflicts:
builtin/commit.c
parse-options.c
Diffstat (limited to 't/t4034')
0 files changed, 0 insertions, 0 deletions