Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/mingw-test-push-unc-path' | Junio C Hamano | 2017-01-19 | 1 | -0/+48 |
|\ | |||||
| * | mingw: add a regression test for pushing to UNC paths | Johannes Schindelin | 2017-01-07 | 1 | -0/+48 |
* | | Merge branch 'km/branch-get-push-while-detached' | Junio C Hamano | 2017-01-19 | 1 | -0/+6 |
|\ \ | |||||
| * | | branch_get_push: do not segfault when HEAD is detached | Kyle Meyer | 2017-01-08 | 1 | -0/+6 |
* | | | Merge branch 'jk/blame-fixes' | Junio C Hamano | 2017-01-19 | 2 | -0/+149 |
|\ \ \ | |||||
| * | | | blame: output porcelain "previous" header for each file | Jeff King | 2017-01-08 | 1 | -0/+117 |
| * | | | blame: handle --no-abbrev | Jeff King | 2017-01-08 | 1 | -0/+4 |
| * | | | blame: fix alignment with --abbrev=40 | Jeff King | 2017-01-08 | 1 | -0/+28 |
* | | | | Merge branch 'jk/archive-zip-userdiff-config' | Junio C Hamano | 2017-01-19 | 1 | -4/+18 |
|\ \ \ \ | |||||
| * | | | | archive-zip: load userdiff config | Jeff King | 2017-01-08 | 1 | -4/+18 |
| |/ / / | |||||
* | | | | Merge branch 'dt/disable-bitmap-in-auto-gc' | Junio C Hamano | 2017-01-19 | 2 | -5/+28 |
|\ \ \ \ | |||||
| * | | | | repack: die on incremental + write-bitmap-index | 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 'sb/submodule-rm-absorb' | Junio C Hamano | 2017-01-19 | 1 | -24/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rm: absorb a submodules git dir before deletion | Stefan Beller | 2016-12-27 | 1 | -26/+17 |
* | | | | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-19 | 1 | -0/+241 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | grep: search history of moved submodules | Brandon Williams | 2016-12-22 | 1 | -0/+41 |
| * | | | | | | | | grep: enable recurse-submodules to work on <tree> objects | Brandon Williams | 2016-12-22 | 1 | -1/+102 |
| * | | | | | | | | grep: optionally recurse into submodules | Brandon Williams | 2016-12-22 | 1 | -0/+99 |
* | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-11 | 2 | -5/+116 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | submodule: add absorb-git-dir function | Stefan Beller | 2016-12-13 | 1 | -0/+101 |
| * | | | | | | | | test-lib-functions.sh: teach test_commit -C <dir> | Stefan Beller | 2016-12-09 | 1 | -5/+15 |
* | | | | | | | | | Merge branch 'mh/fast-import-notes-fix-new' | Junio C Hamano | 2017-01-11 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fast-import: properly fanout notes when tree is imported | Mike Hommey | 2016-12-20 | 1 | -0/+42 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/compression-config' | Junio C Hamano | 2017-01-11 | 3 | -0/+140 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | compression: unify pack.compression configuration parsing | Junio C Hamano | 2016-11-16 | 3 | -0/+140 |
* | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' | Junio C Hamano | 2017-01-11 | 1 | -0/+52 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | upload-pack: optionally allow fetching any sha1 | 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 'ls/p4-lfs' | Junio C Hamano | 2016-12-27 | 1 | -12/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-p4: add diff/merge properties to .gitattributes for GitLFS files | Lars Schneider | 2016-12-20 | 1 | -12/+12 |
* | | | | | | | | | | | Merge branch 'lt/shortlog-by-committer' | Junio C Hamano | 2016-12-27 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t4201: make tests work with and without the MINGW prerequiste | Junio C Hamano | 2016-12-20 | 1 | -1/+7 |
| * | | | | | | | | | | | shortlog: test and document --committer option | Jeff King | 2016-12-16 | 1 | -0/+13 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'gv/p4-multi-path-commit-fix' | Junio C Hamano | 2016-12-27 | 1 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-p4: fix multi-path changelist empty commits | George Vanburgh | 2016-12-19 | 1 | -1/+21 |
* | | | | | | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' | Junio C Hamano | 2016-12-27 | 1 | -0/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: avoid crash adding symlinked directory | Luke Diamand | 2016-12-18 | 1 | -0/+43 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-12-27 | 2 | -26/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t0021: fix flaky test | 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 'bw/transport-protocol-policy' | Junio C Hamano | 2016-12-27 | 5 | -11/+150 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | http: respect protocol.*.allow=user for http-alternates | Jeff King | 2016-12-15 | 1 | -0/+10 |
| * | | | | | | | | | | | | | transport: add from_user parameter to is_transport_allowed | Brandon Williams | 2016-12-15 | 1 | -0/+7 |
| * | | | | | | | | | | | | | transport: add protocol policy config option | Brandon Williams | 2016-12-15 | 3 | -5/+127 |
| * | | | | | | | | | | | | | lib-proto-disable: variable name fix | Brandon Williams | 2016-12-15 | 1 | -6/+6 |
* | | | | | | | | | | | | | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |