aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ls/travis-submitting-patches'Junio C Hamano2016-05-10
|\
| * Documentation: add setup instructions for Travis CILars Schneider2016-05-02
* | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-05-10
|\ \
| * | t5510: run auto-gc in the foregroundSZEDER Gábor2016-05-02
* | | Merge branch 'ew/normal-to-e'Junio C Hamano2016-05-10
|\ \ \
| * | | .mailmap: update to my shorter email addressEric Wong2016-05-02
* | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-05-10
|\ \ \ \
| * | | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-28
| * | | | travis-ci: express Linux/OS X dependency versions more clearlyLars Schneider2016-04-28
| * | | | travis-ci: update Git-LFS and P4 to the latest versionLars Schneider2016-04-19
* | | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-05-10
|\ \ \ \ \
| * | | | | submodule-config: don't shadow `cache`Stefan Beller2016-04-28
| * | | | | config.c: drop local variableStefan Beller2016-04-28
* | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap'Junio C Hamano2016-05-10
|\ \ \ \ \ \
| * | | | | | pack-objects: warn on split packs disabling bitmapsEric Wong2016-04-28
* | | | | | | Sync with maintJunio C Hamano2016-05-06
|\ \ \ \ \ \ \
| * | | | | | | Almost ready for 2.8.3Junio C Hamano2016-05-06
| * | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-06
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano2016-05-06
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-06
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cc/apply' into maintJunio C Hamano2016-05-06
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano2016-05-06
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Tenth batch for 2.9Junio C Hamano2016-05-06
* | | | | | | | | | | | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano2016-05-02
| * | | | | | | | | | | | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-19
| * | | | | | | | | | | | | xdiff: add recs_match helper functionJacob Keller2016-04-18
* | | | | | | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t9824: fix wrong reference valueLars Schneider2016-04-29
| * | | | | | | | | | | | | | t9824: fix broken &&-chain in a subshellSZEDER Gábor2016-04-24
* | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | match-trees: convert several leaf functions to use struct object_idbrian m. carlson2016-04-25
| * | | | | | | | | | | | | | | tree-walk: convert tree_entry_extract() to use struct object_idbrian m. carlson2016-04-25
| * | | | | | | | | | | | | | | struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-25
| * | | | | | | | | | | | | | | match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson2016-04-19
| * | | | | | | | | | | | | | | test-match-trees: convert to use struct object_idbrian m. carlson2016-04-19
| * | | | | | | | | | | | | | | sha1-name: introduce a get_oid() functionbrian m. carlson2016-04-19
* | | | | | | | | | | | | | | | Merge branch 'bw/rebase-merge-entire-branch'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-rebase--merge: don't include absent parent as a baseBen Woosley2016-04-24
* | | | | | | | | | | | | | | | | Merge branch 'jc/drop-git-spec-in'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Makefile: remove dependency on git.specDennis Kaarsemaker2016-04-27
| * | | | | | | | | | | | | | | | | Makefile: stop pretending to support rpmbuildJunio C Hamano2016-04-06
* | | | | | | | | | | | | | | | | | Merge branch 'js/http-custom-headers'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | http: support sending custom HTTP headersJohannes Schindelin2016-04-27
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | clone: add `--shallow-submodules` flagStefan Beller2016-04-26
* | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-test-py3'Junio C Hamano2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHLuke Diamand2016-04-26
| * | | | | | | | | | | | | | | | | | | git-p4 tests: work with python3 as well as python2Luke Diamand2016-04-26
| * | | | | | | | | | | | | | | | | | | git-p4 tests: cd to / before running pythonLuke Diamand2016-04-26
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |