Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | diff: add interhunk context config optionvn/diff-ihc-config | Vegard Nossum | 2017-01-12 | 1 | -1/+26 |
* | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-10 | 2 | -5/+116 |
|\ | |||||
| * | submodule: add absorb-git-dir function | Stefan Beller | 2016-12-12 | 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-10 | 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' | Junio C Hamano | 2017-01-10 | 3 | -0/+140 |
|\ \ \ | |||||
| * | | | compression: unify pack.compression configuration parsingjc/compression-config | Junio C Hamano | 2016-11-15 | 3 | -0/+140 |
* | | | | Merge branch 'dt/smart-http-detect-server-going-away' | Junio C Hamano | 2017-01-10 | 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 'ls/p4-lfs' | Junio C Hamano | 2016-12-27 | 1 | -12/+12 |
|\ \ \ \ | |||||
| * | | | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfs | 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 prerequistelt/shortlog-by-committer | 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 commitsgv/p4-multi-path-commit-fix | 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 directoryld/p4-compare-dir-vs-symlink | 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 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 'bw/transport-protocol-policy' | Junio C Hamano | 2016-12-27 | 5 | -11/+150 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | http: respect protocol.*.allow=user for http-alternatesbw/transport-protocol-policy | 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-14 | 1 | -6/+6 |
* | | | | | | | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: ensure '--abort' option takes no arguments | Chris Packham | 2016-12-14 | 1 | -0/+2 |
| * | | | | | | | | merge: add '--continue' option as a synonym for 'git commit' | Chris Packham | 2016-12-14 | 1 | -0/+9 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'va/i18n-perl-scripts' | Junio C Hamano | 2016-12-27 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: add--interactive: mark patch prompt for translation | Vasco Almeida | 2016-12-14 | 1 | -1/+4 |
| * | | | | | | | | i18n: add--interactive: mark plural strings | Vasco Almeida | 2016-12-14 | 1 | -1/+10 |
* | | | | | | | | | Merge branch 'sb/submodule-config-cleanup' | Junio C Hamano | 2016-12-27 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule-config: rename commit_sha1 to treeish_name | Stefan Beller | 2016-11-22 | 1 | -0/+14 |
* | | | | | | | | | | Merge branch 'jc/push-default-explicit' | Junio C Hamano | 2016-12-27 | 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' | Junio C Hamano | 2016-12-21 | 6 | -43/+34 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t: use nongit() function where applicable | Jeff King | 2016-12-16 | 3 | -29/+5 |
| * | | | | | | | | | | | index-pack: complain when --stdin is used outside of a repo | Jeff King | 2016-12-16 | 1 | -0/+15 |
| * | | | | | | | | | | | t5000: extract nongit function to test-lib-functions.sh | Jeff King | 2016-12-16 | 2 | -14/+14 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component' | Junio C Hamano | 2016-12-21 | 2 | -0/+43 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on Windows | Johannes Sixt | 2016-12-21 | 1 | -1/+1 |
| * | | | | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, too | Johannes Sixt | 2016-12-13 | 1 | -4/+10 |
| * | | | | | | | | | | | tmp-objdir: quote paths we add to alternates | Jeff King | 2016-12-12 | 1 | -0/+19 |
| * | | | | | | | | | | | alternates: accept double-quoted paths | Jeff King | 2016-12-12 | 1 | -0/+18 |
| * | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component | Junio C Hamano | 2016-12-12 | 1 | -0/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vs/submodule-clone-nested-submodules-alternates' | Junio C Hamano | 2016-12-21 | 1 | -0/+66 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | submodule--helper: set alternateLocation for cloned submodulesvs/submodule-clone-nested-submodules-alternates | Vitaly "_Vi" Shukela | 2016-12-12 | 1 | -0/+66 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | |