aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* t6006: drop "always" color config testsJeff King2017-10-04
* t7502: use diff.noprefix for --verbose testJeff King2017-10-04
* t7508: use test_terminal for color outputJeff King2017-10-04
* t3701: use test-terminal to collect color outputJeff King2017-10-04
* t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-04
* test-terminal: set TERM=vt100Jeff King2017-10-04
* ref-filter: consult want_color() before emitting colorsJeff King2017-07-13
* pretty: respect color settings for %C placeholdersJeff King2017-07-13
* rev-list: pass diffopt->use_colors through to pretty-printJeff King2017-07-13
* for-each-ref: load config earlierJeff King2017-07-13
* color: check color.ui in git_default_config()Jeff King2017-07-13
* ref-filter: pass ref_format struct to atom parsersJeff King2017-07-13
* ref-filter: factor out the parsing of sorting atomsJeff King2017-07-13
* ref-filter: make parse_ref_filter_atom a private functionJeff King2017-07-13
* ref-filter: provide a function for parsing sort optionsJeff King2017-07-13
* ref-filter: move need_color_reset_at_eol into ref_formatJeff King2017-07-13
* ref-filter: abstract ref format into its own structJeff King2017-07-13
* ref-filter: simplify automatic color resetJeff King2017-07-13
* t: use test_decode_color rather than literal ANSI codesJeff King2017-07-13
* docs/for-each-ref: update pointer to color syntaxJeff King2017-07-13
* check return value of verify_ref_format()Jeff King2017-07-13
* Sync with v2.13.3Junio C Hamano2017-07-12
|\
| * Git 2.13.3Junio C Hamano2017-07-12
| * Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-12
| |\
| * \ Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-12
| |\ \
| * \ \ Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano2017-07-12
| |\ \ \
* | | | | Hopefully the last batch before -rc0Junio C Hamano2017-07-12
* | | | | Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-12
|\ \ \ \ \
| * | | | | doc: correct a mistake in an illustrationKaartic Sivaraam2017-07-10
* | | | | | Merge branch 'rs/wt-status-cleanup'Junio C Hamano2017-07-12
|\ \ \ \ \ \
| * | | | | | wt-status: use separate variable for result of shorten_unambiguous_refRené Scharfe2017-07-10
* | | | | | | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-12
|\ \ \ \ \ \ \
| * | | | | | | use DIV_ROUND_UPRené Scharfe2017-07-10
| |/ / / / / /
* | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-12
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | ref-filter.c: drop return from void functionAlejandro R. Sedeño2017-07-10
| * | | | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-09
| * | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-09
| * | | | | | branch: only perform HEAD check for local branchesJeff King2017-07-09
* | | | | | | Merge branch 'rs/urlmatch-cleanup'Junio C Hamano2017-07-12
|\ \ \ \ \ \ \
| * | | | | | | urlmatch: use hex2chr() in append_normalized_escapes()René Scharfe2017-07-09
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-12
|\ \ \ \ \ \ \
| * | | | | | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()René Scharfe2017-07-09
* | | | | | | | Merge branch 'sb/submodule-doc'Junio C Hamano2017-07-12
|\ \ \ \ \ \ \ \
| * | | | | | | | submodules: overhaul documentationStefan Beller2017-06-22
* | | | | | | | | Sync with maintJunio C Hamano2017-07-10
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Prepare for 2.13.3Junio C Hamano2017-07-10
| * | | | | | | | Merge branch 'sb/merge-recursive-code-cleanup' into maintJunio C Hamano2017-07-10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/utf8-fprintf' into maintJunio C Hamano2017-07-10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/fsck-name-object' into maintJunio C Hamano2017-07-10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maintJunio C Hamano2017-07-10
| |\ \ \ \ \ \ \ \ \ \ \