Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/reflog-walk' into maint | Junio C Hamano | 2017-08-23 | 3 | -12/+136 |
|\ | |||||
| * | reflog-walk: apply --since/--until to reflog datesjk/reflog-walk | Jeff King | 2017-07-09 | 1 | -0/+26 |
| * | reflog-walk: stop using fake parents | Jeff King | 2017-07-09 | 2 | -8/+7 |
| * | rev-list: check reflog_info before showing usage | Jeff King | 2017-07-09 | 1 | -0/+4 |
| * | t1414: document some reflog-walk oddities | Jeff King | 2017-07-07 | 2 | -10/+105 |
| * | Merge branch 'jk/reflog-walk-maint' into jk/reflog-walk | Junio C Hamano | 2017-07-07 | 2 | -0/+21 |
| |\ | |||||
* | \ | Merge branch 'jk/ref-filter-colors' into maint | Junio C Hamano | 2017-08-23 | 6 | -72/+175 |
|\ \ \ | |||||
| * | | | ref-filter: consult want_color() before emitting colorsjk/ref-filter-colors | Jeff King | 2017-07-13 | 3 | -11/+82 |
| * | | | pretty: respect color settings for %C placeholders | Jeff King | 2017-07-13 | 1 | -34/+50 |
| * | | | rev-list: pass diffopt->use_colors through to pretty-print | Jeff King | 2017-07-13 | 1 | -0/+11 |
| * | | | t: use test_decode_color rather than literal ANSI codes | Jeff King | 2017-07-13 | 4 | -39/+44 |
* | | | | Merge tag 'v2.13.5' into maint | Junio C Hamano | 2017-08-04 | 4 | -2/+57 |
|\ \ \ \ | |||||
| * \ \ \ | Merge tag 'v2.12.4' into maint | Junio C Hamano | 2017-08-01 | 4 | -2/+57 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge tag 'v2.11.3' into maint-2.12 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge tag 'v2.10.4' into maint-2.11 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge tag 'v2.9.5' into maint-2.10 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | Merge tag 'v2.8.6' into maint-2.9 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | Merge tag 'v2.7.6' into maint-2.8 | Junio C Hamano | 2017-07-30 | 3 | -0/+51 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * | | | | connect: reject paths that look like command line options | Jeff King | 2017-07-28 | 2 | -0/+37 |
| | | | | | | * | | | | connect: reject dashed arguments for proxy commands | Jeff King | 2017-07-28 | 1 | -0/+5 |
| | | | | | | * | | | | t5813: add test for hostname starting with dash | Jeff King | 2017-07-28 | 1 | -0/+9 |
| | * | | | | | | | | | t/lib-proto-disable: restore protocol.allow after config tests | Jeff King | 2017-07-28 | 1 | -2/+6 |
| * | | | | | | | | | | Merge branch 'jk/test-copy-bytes-fix' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/unquote-path-in-git-pm' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/gc-pre-detach-under-hook' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/push-to-cygwin-unc-path' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/alias-case-sensitivity' into maint | Junio C Hamano | 2017-07-21 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mt/p4-parse-G-output' | Junio C Hamano | 2017-07-20 | 1 | -0/+103 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | git-p4: filter for {'code':'info'} in p4CmdListmt/p4-parse-G-output | Miguel Torroja | 2017-07-13 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | git-p4: parse marshal output "p4 -G" in p4 changes | Miguel Torroja | 2017-07-13 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | git-p4: git-p4 tests with p4 triggers | Miguel Torroja | 2017-07-13 | 1 | -0/+103 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/test-copy-bytes-fix' | Junio C Hamano | 2017-07-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | t: handle EOF in test_copy_bytes()jk/test-copy-bytes-fix | Jeff King | 2017-07-17 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-07-12 | 1 | -0/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reflog-walk-maint' into maint | Junio C Hamano | 2017-07-12 | 2 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'js/alias-case-sensitivity' | Junio C Hamano | 2017-07-20 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | alias: compare alias name *case-insensitively*js/alias-case-sensitivity | Johannes Schindelin | 2017-07-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | t1300: demonstrate that CamelCased aliases regressed | Johannes Schindelin | 2017-07-17 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook' | Junio C Hamano | 2017-07-18 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | gc: run pre-detach operations under lockjk/gc-pre-detach-under-hook | Jeff King | 2017-07-12 | 1 | -0/+21 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'js/fsck-name-object' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/shared-index-permfix' into maint | Junio C Hamano | 2017-07-10 | 3 | -11/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/t7508-indent-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/t4005-modernize' into maint | Junio C Hamano | 2017-07-10 | 1 | -52/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/apply-validate-input' into maint | Junio C Hamano | 2017-07-10 | 3 | -1/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pw/rebase-i-regression-fix-tests' into maint | Junio C Hamano | 2017-07-10 | 2 | -5/+140 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-p-commentchar-fix' into maint | Junio C Hamano | 2017-07-10 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/alias-early-config' into maint | Junio C Hamano | 2017-07-10 | 3 | -1/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/push-to-cygwin-unc-path' | Junio C Hamano | 2017-07-18 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |