Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-away | David Turner | 2016-11-18 | 1 | -0/+22 |
| * | | | | | | | | | | | | | | | | | | | | remote-curl: don't hang when a server dies before any output | David Turner | 2016-11-18 | 1 | -0/+30 |
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'gv/p4-multi-path-commit-fix' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fix | George Vanburgh | 2016-12-19 | 1 | -1/+21 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlink | Luke Diamand | 2016-12-18 | 1 | -0/+43 |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-default-explicit' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | push: test pushing ambiguously named branchesjc/push-default-explicit | Dennis Kaarsemaker | 2016-10-31 | 1 | -0/+10 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint | Junio C Hamano | 2017-01-17 | 6 | -43/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | t: use nongit() function where applicable | Jeff King | 2016-12-16 | 3 | -29/+5 |