summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/submodule-init'Junio C Hamano2016-05-177-141/+461
|\
| * submodule init: redirect stdout to stderrStefan Beller2016-05-032-7/+20
| * submodule--helper update-clone: abort gracefully on missing .gitmodulesStefan Beller2016-04-292-13/+33
| * submodule init: fail gracefully with a missing .gitmodules fileStefan Beller2016-04-292-3/+15
| * submodule: port init from shell to CStefan Beller2016-04-174-45/+140
| * submodule: port resolve_relative_url from shell to CStefan Beller2016-04-173-78/+258
| * Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-initJunio C Hamano2016-04-14461-26356/+54828
| |\
| * \ Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-initJunio C Hamano2016-04-142-23/+59
| |\ \
* | | | Twelfth batch for 2.9Junio C Hamano2016-05-131-0/+20
* | | | Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-05-131-1/+1
|\ \ \ \
| * | | | submodule deinit test: fix broken && chain in subshellStefan Beller2016-05-031-1/+1
* | | | | Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano2016-05-134-10/+16
|\ \ \ \ \
| * | | | | commit-tree: do not pay attention to commit.gpgsignJunio C Hamano2016-05-034-10/+16
* | | | | | git-multimail: update to release 1.3.1Matthieu Moy2016-05-134-4/+20
* | | | | | Eleventh batch for 2.9Junio C Hamano2016-05-101-0/+21
* | | | | | Merge branch 'svn/bad-ref' of git://bogomips.org/git-svnJunio C Hamano2016-05-101-1/+2
|\ \ \ \ \ \
| * | | | | | Git/SVN: die when there is no commit metadataChristian Couder2016-05-081-1/+2
* | | | | | | Merge branch 'sk/gitweb-highlight-encoding'Junio C Hamano2016-05-101-0/+3
|\ \ \ \ \ \ \
| * | | | | | | gitweb: apply fallback encoding before highlightShin Kojima2016-05-031-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/clean-test-fix'Junio C Hamano2016-05-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t7300: mark test with SANITYStefan Beller2016-05-031-1/+1
* | | | | | | | Merge branch 'rn/glossary-typofix'Junio C Hamano2016-05-101-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: fix typo 'In such these cases'René Nyffenegger2016-05-021-1/+1
* | | | | | | | | Merge branch 'ls/travis-submitting-patches'Junio C Hamano2016-05-101-17/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: add setup instructions for Travis CILars Schneider2016-05-021-17/+63
* | | | | | | | | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-05-101-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5510: run auto-gc in the foregroundSZEDER Gábor2016-05-021-0/+1
* | | | | | | | | | | Merge branch 'ew/normal-to-e'Junio C Hamano2016-05-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | .mailmap: update to my shorter email addressEric Wong2016-05-021-0/+1
* | | | | | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-05-103-10/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-282-3/+14
| * | | | | | | | | | | | travis-ci: express Linux/OS X dependency versions more clearlyLars Schneider2016-04-281-7/+10
| * | | | | | | | | | | | travis-ci: update Git-LFS and P4 to the latest versionLars Schneider2016-04-191-2/+2
* | | | | | | | | | | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-05-102-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule-config: don't shadow `cache`Stefan Beller2016-04-281-6/+6
| * | | | | | | | | | | | | config.c: drop local variableStefan Beller2016-04-281-4/+1
* | | | | | | | | | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap'Junio C Hamano2016-05-104-9/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | pack-objects: warn on split packs disabling bitmapsEric Wong2016-04-284-9/+23
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-05-061-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Almost ready for 2.8.3Junio C Hamano2016-05-061-0/+9
| * | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-063-11/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano2016-05-065-28/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/apply' into maintJunio C Hamano2016-05-061-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano2016-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | Tenth batch for 2.9Junio C Hamano2016-05-061-2/+30
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-063-4/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano2016-05-022-11/+0
| * | | | | | | | | | | | | | | | | | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-195-0/+50
| * | | | | | | | | | | | | | | | | | | xdiff: add recs_match helper functionJacob Keller2016-04-181-4/+10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |