summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* color: document that "git -c color.*=always" is a bit specialjk/ui-color-always-to-auto-maintJonathan Nieder2017-10-131-23/+45
* color: downgrade "always" to "auto" only for on-disk configurationJeff King2017-10-122-2/+26
* color: make "always" the same as "auto" in configJeff King2017-10-043-19/+28
* provide --color option for all ref-filter usersJeff King2017-10-046-4/+16
* t3205: use --color instead of color.branch=alwaysJeff King2017-10-041-3/+2
* t3203: drop "always" color testJeff King2017-10-041-6/+0
* t6006: drop "always" color config testsJeff King2017-10-041-15/+5
* t7502: use diff.noprefix for --verbose testJeff King2017-10-041-2/+2
* t7508: use test_terminal for color outputJeff King2017-10-041-20/+21
* t3701: use test-terminal to collect color outputJeff King2017-10-041-5/+3
* t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-041-14/+14
* test-terminal: set TERM=vt100Jeff King2017-10-047-10/+9
* ref-filter: consult want_color() before emitting colorsjk/ref-filter-colorsJeff King2017-07-136-12/+93
* pretty: respect color settings for %C placeholdersJeff King2017-07-133-45/+84
* rev-list: pass diffopt->use_colors through to pretty-printJeff King2017-07-132-0/+12
* for-each-ref: load config earlierJeff King2017-07-131-3/+2
* color: check color.ui in git_default_config()Jeff King2017-07-137-16/+8
* ref-filter: pass ref_format struct to atom parsersJeff King2017-07-131-17/+25
* ref-filter: factor out the parsing of sorting atomsJeff King2017-07-131-4/+8
* ref-filter: make parse_ref_filter_atom a private functionJeff King2017-07-132-3/+1
* ref-filter: provide a function for parsing sort optionsJeff King2017-07-133-30/+11
* ref-filter: move need_color_reset_at_eol into ref_formatJeff King2017-07-132-4/+6
* ref-filter: abstract ref format into its own structJeff King2017-07-136-52/+70
* ref-filter: simplify automatic color resetJeff King2017-07-131-5/+1
* t: use test_decode_color rather than literal ANSI codesJeff King2017-07-134-39/+44
* docs/for-each-ref: update pointer to color syntaxJeff King2017-07-131-2/+4
* check return value of verify_ref_format()Jeff King2017-07-133-5/+10
* Sync with v2.13.3Junio C Hamano2017-07-121-0/+9
|\
| * Git 2.13.3v2.13.3Junio C Hamano2017-07-122-1/+10
| * Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-123-7/+54
| |\
| * \ Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-121-1/+1
| |\ \
| * \ \ Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano2017-07-123-12/+42
| |\ \ \
* | | | | Hopefully the last batch before -rc0Junio C Hamano2017-07-121-0/+9
* | | | | Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-121-1/+1
|\ \ \ \ \
| * | | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
* | | | | | Merge branch 'rs/wt-status-cleanup'Junio C Hamano2017-07-121-3/+4
|\ \ \ \ \ \
| * | | | | | wt-status: use separate variable for result of shorten_unambiguous_refrs/wt-status-cleanupRené Scharfe2017-07-101-3/+4
* | | | | | | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-129-15/+14
|\ \ \ \ \ \ \
| * | | | | | | use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-109-15/+14
| |/ / / / / /
* | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-123-7/+54
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | ref-filter.c: drop return from void functionkn/ref-filter-branch-listAlejandro R. Sedeño2017-07-101-1/+1
| * | | | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
| * | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-092-2/+47
| * | | | | | branch: only perform HEAD check for local branchesJeff King2017-07-091-1/+2
* | | | | | | Merge branch 'rs/urlmatch-cleanup'Junio C Hamano2017-07-121-5/+5
|\ \ \ \ \ \ \
| * | | | | | | urlmatch: use hex2chr() in append_normalized_escapes()rs/urlmatch-cleanupRené Scharfe2017-07-091-5/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano2017-07-121-2/+1
|\ \ \ \ \ \ \
| * | | | | | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-readingRené Scharfe2017-07-091-2/+1
* | | | | | | | Merge branch 'sb/submodule-doc'Junio C Hamano2017-07-124-36/+234
|\ \ \ \ \ \ \ \
| * | | | | | | | submodules: overhaul documentationsb/submodule-docStefan Beller2017-06-224-36/+234
View Lorry Controller Status