| commit | f946b465d7fa13a235dd5653d37c7babb1ceb233 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Aug 2011 04:19:16 +0000 (28 21:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Aug 2011 04:19:16 +0000 (28 21:19 -0700) | ||
| tree | d3a1aa2e6f0779e5440cec0815f0d59d9e31b4d4 | treesnapshot (tar.gz zip) |
| parent | e5cfcb04e0acc5f3b51e6d69487028315b33e4c9 | commitdiff |
| parent | c9bfb953489e559d513c1627150aa16f8d42d6c5 | commitdiff |
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
* 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