Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tag: respect color.ui configjk/ref-filter-colors-fix | Jeff King | 2017-10-17 | 3 | -1/+12 |
* | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 8 | -9/+17 |
* | Revert "t6006: drop "always" color config tests" | Jeff King | 2017-10-17 | 1 | -5/+15 |
* | Revert "color: make "always" the same as "auto" in config" | Jeff King | 2017-10-17 | 3 | -19/+20 |
* | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt... | Junio C Hamano | 2017-10-17 | 18 | -98/+100 |
|\ | |||||
| * | color: make "always" the same as "auto" in config | Jeff King | 2017-10-04 | 3 | -19/+28 |
| * | provide --color option for all ref-filter users | Jeff King | 2017-10-04 | 6 | -4/+16 |
| * | t3205: use --color instead of color.branch=always | Jeff King | 2017-10-04 | 1 | -3/+2 |
| * | t3203: drop "always" color test | Jeff King | 2017-10-04 | 1 | -6/+0 |
| * | t6006: drop "always" color config tests | Jeff King | 2017-10-04 | 1 | -15/+5 |
| * | t7502: use diff.noprefix for --verbose test | Jeff King | 2017-10-04 | 1 | -2/+2 |
| * | t7508: use test_terminal for color output | Jeff King | 2017-10-04 | 1 | -20/+21 |
| * | t3701: use test-terminal to collect color output | Jeff King | 2017-10-04 | 1 | -5/+3 |
| * | t4015: prefer --color to -c color.diff=always | Jeff King | 2017-10-04 | 1 | -14/+14 |
| * | test-terminal: set TERM=vt100 | Jeff King | 2017-10-04 | 7 | -10/+9 |
* | | Git 2.14.2v2.14.2 | Junio C Hamano | 2017-09-22 | 1 | -0/+11 |
* | | Sync with 2.13.6 | Junio C Hamano | 2017-09-22 | 10 | -56/+172 |
|\ \ | |||||
| * | | Git 2.13.6v2.13.6maint-2.13 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| * | | Sync with 2.12.5 | Junio C Hamano | 2017-09-22 | 9 | -56/+155 |
| |\ \ | |||||
| | * | | Git 2.12.5v2.12.5maint-2.12 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| | * | | Sync with 2.11.4 | Junio C Hamano | 2017-09-22 | 8 | -56/+138 |
| | |\ \ | |||||
| | | * | | Git 2.11.4v2.11.4maint-2.11 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| | | * | | Sync with 2.10.5 | Junio C Hamano | 2017-09-22 | 7 | -56/+121 |
| | | |\ \ | |||||
| | | | * | | Git 2.10.5v2.10.5maint-2.10 | Junio C Hamano | 2017-09-22 | 3 | -2/+19 |
| | | | * | | Merge branch 'jk/safe-pipe-capture' into maint-2.10 | Junio C Hamano | 2017-09-22 | 1 | -2/+2 |
| | | | |\ \ | |||||
| | | | | * | | archimport: use safe_pipe_capture for user inputjk/safe-pipe-capture | Jeff King | 2017-09-12 | 1 | -2/+2 |
| | | | * | | | Merge branch 'jk/cvsimport-quoting' into maint-2.10 | Junio C Hamano | 2017-09-22 | 1 | -0/+1 |
| | | | |\ \ \ | |||||
| | | | | * | | | cvsimport: shell-quote variable used in backticks | Jeff King | 2017-09-12 | 1 | -0/+1 |
| | | | | |/ / | |||||
| | | | * | | | Merge branch 'jc/cvsserver' into maint-2.10 | Junio C Hamano | 2017-09-22 | 1 | -40/+37 |
| | | | |\ \ \ | |||||
| | | | | * | | | cvsserver: use safe_pipe_capture for `constant commands` as welljc/cvsserver | Junio C Hamano | 2017-09-11 | 1 | -4/+4 |
| | | | | * | | | cvsserver: use safe_pipe_capture instead of backticks | joernchen | 2017-09-11 | 1 | -11/+11 |
| | | | | * | | | cvsserver: move safe_pipe_capture() to the main package | Junio C Hamano | 2017-09-11 | 1 | -25/+22 |
| | | | | |/ / | |||||
| | | | * | | | Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10 | Junio C Hamano | 2017-09-22 | 3 | -14/+64 |
| | | | |\ \ \ | |||||
| | | | | * | | | shell: drop git-cvsserver support by defaultjk/git-shell-drop-cvsserver | Jeff King | 2017-09-12 | 3 | -14/+64 |
| | | | | |/ / | |||||
* | | | | | | | RelNotes: further fixes for 2.14.2 from the master front | Junio C Hamano | 2017-09-10 | 1 | -0/+59 |
* | | | | | | | Merge branch 'jt/doc-pack-objects-fix' into maint | Junio C Hamano | 2017-09-10 | 1 | -6/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fix | Jonathan Tan | 2017-08-23 | 1 | -6/+11 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jn/vcs-svn-cleanup' into maint | Junio C Hamano | 2017-09-10 | 6 | -86/+56 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | vcs-svn: move remaining repo_tree functions to fast_export.hjn/vcs-svn-cleanup | Jonathan Nieder | 2017-08-23 | 6 | -55/+39 |
| * | | | | | | | vcs-svn: remove repo_delete wrapper function | Jonathan Nieder | 2017-08-23 | 3 | -8/+2 |
| * | | | | | | | vcs-svn: remove custom mode constants | Jonathan Nieder | 2017-08-23 | 4 | -21/+16 |
| * | | | | | | | vcs-svn: remove more unused prototypes and declarations | Jonathan Nieder | 2017-08-23 | 1 | -3/+0 |
* | | | | | | | | Merge branch 'bc/vcs-svn-cleanup' into maint | Junio C Hamano | 2017-09-10 | 3 | -17/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | vcs-svn: rename repo functions to "svn_repo"bc/vcs-svn-cleanup | brian m. carlson | 2017-08-20 | 3 | -10/+10 |
| * | | | | | | | vcs-svn: remove unused prototypes | brian m. carlson | 2017-08-20 | 1 | -7/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/doc-the-this' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc: fix typo in sendemail.identityjk/doc-the-this | Jeff King | 2017-08-20 | 1 | -2/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/commit-h-single-parent-cleanup' into maint | Junio C Hamano | 2017-09-10 | 1 | -5/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: remove unused inline function single_parent()rs/commit-h-single-parent-cleanup | René Scharfe | 2017-08-19 | 1 | -5/+0 |
* | | | | | | | | Merge branch 'mg/format-ref-doc-fix' into maint | Junio C Hamano | 2017-09-10 | 3 | -8/+9 |
|\ \ \ \ \ \ \ \ |