Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'mh/fast-import-notes-fix-new' | Junio C Hamano | 2017-01-10 |
|\ | |||
| * | fast-import: properly fanout notes when tree is imported | Mike Hommey | 2016-12-20 |
* | | Merge branch 'jc/compression-config' | Junio C Hamano | 2017-01-10 |
|\ \ | |||
| * | | compression: unify pack.compression configuration parsing | Junio C Hamano | 2016-11-15 |
* | | | Merge branch 'dt/smart-http-detect-server-going-away' | Junio C Hamano | 2017-01-10 |
|\ \ \ | |||
| * | | | upload-pack: optionally allow fetching any sha1 | David Turner | 2016-11-18 |
| * | | | remote-curl: don't hang when a server dies before any output | David Turner | 2016-11-18 |
| |/ / | |||
* | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-12-27 |
|\ \ \ | |||
| * | | | git-p4: add diff/merge properties to .gitattributes for GitLFS files | Lars Schneider | 2016-12-20 |
* | | | | Merge branch 'lt/shortlog-by-committer' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ | |||
| * | | | | t4201: make tests work with and without the MINGW prerequiste | Junio C Hamano | 2016-12-20 |
| * | | | | shortlog: test and document --committer option | Jeff King | 2016-12-16 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'gv/p4-multi-path-commit-fix' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ | |||
| * | | | | git-p4: fix multi-path changelist empty commits | George Vanburgh | 2016-12-19 |
* | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ | |||
| * | | | | | git-p4: avoid crash adding symlinked directory | Luke Diamand | 2016-12-18 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'ls/filter-process' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ | |||
| * | | | | | t0021: fix flaky test | Lars Schneider | 2016-12-18 |
| * | | | | | docs: warn about possible '=' in clean/smudge filter process values | Lars Schneider | 2016-12-06 |
* | | | | | | Merge branch 'bw/transport-protocol-policy' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | http: respect protocol.*.allow=user for http-alternates | Jeff King | 2016-12-15 |
| * | | | | | | transport: add from_user parameter to is_transport_allowed | Brandon Williams | 2016-12-15 |
| * | | | | | | transport: add protocol policy config option | Brandon Williams | 2016-12-15 |
| * | | | | | | lib-proto-disable: variable name fix | Brandon Williams | 2016-12-14 |
* | | | | | | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | merge: ensure '--abort' option takes no arguments | Chris Packham | 2016-12-14 |
| * | | | | | | | merge: add '--continue' option as a synonym for 'git commit' | Chris Packham | 2016-12-14 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'va/i18n-perl-scripts' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | i18n: add--interactive: mark patch prompt for translation | Vasco Almeida | 2016-12-14 |
| * | | | | | | | i18n: add--interactive: mark plural strings | Vasco Almeida | 2016-12-14 |
* | | | | | | | | Merge branch 'sb/submodule-config-cleanup' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | submodule-config: rename commit_sha1 to treeish_name | Stefan Beller | 2016-11-22 |
* | | | | | | | | | Merge branch 'jc/push-default-explicit' | Junio C Hamano | 2016-12-27 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | push: test pushing ambiguously named branches | Dennis Kaarsemaker | 2016-10-31 |
* | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' | Junio C Hamano | 2016-12-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t: use nongit() function where applicable | Jeff King | 2016-12-16 |
| * | | | | | | | | | | index-pack: complain when --stdin is used outside of a repo | Jeff King | 2016-12-16 |
| * | | | | | | | | | | t5000: extract nongit function to test-lib-functions.sh | Jeff King | 2016-12-16 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component' | Junio C Hamano | 2016-12-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on Windows | Johannes Sixt | 2016-12-21 |
| * | | | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, too | Johannes Sixt | 2016-12-13 |
| * | | | | | | | | | | tmp-objdir: quote paths we add to alternates | Jeff King | 2016-12-12 |
| * | | | | | | | | | | alternates: accept double-quoted paths | Jeff King | 2016-12-12 |
| * | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component | Junio C Hamano | 2016-12-12 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'vs/submodule-clone-nested-submodules-alternates' | Junio C Hamano | 2016-12-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | submodule--helper: set alternateLocation for cloned submodules | Vitaly "_Vi" Shukela | 2016-12-12 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'sb/sequencer-abort-safety' | Junio C Hamano | 2016-12-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | sequencer: make sequencer abort safer | Stephan Beyer | 2016-12-09 |
| * | | | | | | | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEAD | Stephan Beyer | 2016-12-09 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'sb/t3600-cleanup' | Junio C Hamano | 2016-12-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ |