Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 2.10.5 | Junio C Hamano | 2017-09-22 | 1 | -0/+48 |
|\ | |||||
| * | Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10 | Junio C Hamano | 2017-09-22 | 1 | -0/+48 |
| |\ | |||||
| | * | shell: drop git-cvsserver support by defaultjk/git-shell-drop-cvsserver | Jeff King | 2017-09-12 | 1 | -0/+48 |
* | | | 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 |
* | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint | Junio C Hamano | 2017-01-31 | 1 | -11/+15 |
|\ \ \ \ \ | |||||
| * | | | | | t7810: avoid assumption about invalid regex syntaxjk/grep-e-could-be-extended-beyond-posix | Jeff King | 2017-01-11 | 1 | -11/+15 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'km/branch-get-push-while-detached' into maint | Junio C Hamano | 2017-01-31 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | branch_get_push: do not segfault when HEAD is detachedkm/branch-get-push-while-detached | Kyle Meyer | 2017-01-07 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/blame-fixes' into maint | Junio C Hamano | 2017-01-31 | 2 | -0/+149 |
|\ \ \ \ \ | |||||
| * | | | | | blame: output porcelain "previous" header for each filejk/blame-fixes | Jeff King | 2017-01-07 | 1 | -0/+117 |
| * | | | | | blame: handle --no-abbrev | Jeff King | 2017-01-07 | 1 | -0/+4 |
| * | | | | | blame: fix alignment with --abbrev=40 | Jeff King | 2017-01-07 | 1 | -0/+28 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/archive-zip-userdiff-config' into maint | Junio C Hamano | 2017-01-31 | 1 | -4/+18 |
|\ \ \ \ \ | |||||
| * | | | | | archive-zip: load userdiff configjk/archive-zip-userdiff-config | Jeff King | 2017-01-07 | 1 | -4/+18 |
| |/ / / / | |||||
* | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc' into maint | Junio C Hamano | 2017-01-31 | 2 | -5/+28 |
|\ \ \ \ \ | |||||
| * | | | | | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gc | David Turner | 2016-12-29 | 1 | -5/+3 |
| * | | | | | auto gc: don't write bitmaps for incremental repacks | David Turner | 2016-12-29 | 1 | -0/+25 |
| |/ / / / | |||||
| * | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-11-29 | 2 | -3/+18 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'as/merge-attr-sleep' into maint | Junio C Hamano | 2016-11-29 | 1 | -5/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mm/send-email-cc-cruft-after-address' into maint | Junio C Hamano | 2016-11-29 | 2 | -4/+33 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'pb/test-parse-options-expect' into maint | Junio C Hamano | 2016-10-28 | 1 | -170/+13 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/tap-verbose-fix' into maint | Junio C Hamano | 2016-10-28 | 2 | -4/+36 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fetch-quick-tag-following' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+99 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/merge-base-fork-point-without-reflog' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/ref-symlink-loop' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/fast-import-notes-fix-new' into maint | Junio C Hamano | 2017-01-31 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | fast-import: properly fanout notes when tree is importedmh/fast-import-notes-fix-new | Mike Hommey | 2016-12-20 | 1 | -0/+42 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/compression-config' into maint | Junio C Hamano | 2017-01-31 | 3 | -0/+140 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | compression: unify pack.compression configuration parsingjc/compression-config | Junio C Hamano | 2016-11-15 | 3 | -0/+140 |
* | | | | | | | | | | | | | | | | | Merge branch 'ls/filter-process' into maint | Junio C Hamano | 2017-01-17 | 2 | -26/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t0021: fix flaky testls/filter-process | Lars Schneider | 2016-12-18 | 1 | -16/+1 |
| * | | | | | | | | | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process values | Lars Schneider | 2016-12-06 | 2 | -12/+16 |
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/t3600-cleanup' into maint | Junio C Hamano | 2017-01-17 | 1 | -73/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | t3600: slightly modernize stylesb/t3600-cleanup | Stefan Beller | 2016-12-12 | 1 | -73/+51 |
| * | | | | | | | | | | | | | | | | | | t3600: remove useless redirect | Stefan Beller | 2016-12-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sb/unpack-trees-grammofix' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofix | Stefan Beller | 2016-12-05 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/t0021-fixup' into maint | Junio C Hamano | 2017-01-17 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t0021: minor filter process test cleanupls/t0021-fixup | Lars Schneider | 2016-12-05 | 1 | -3/+2 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktemp | Jeff King | 2016-11-29 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |