Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/submodule-init' | Junio C Hamano | 2016-05-17 | 7 | -141/+461 |
|\ | |||||
| * | submodule init: redirect stdout to stderr | Stefan Beller | 2016-05-03 | 2 | -7/+20 |
| * | submodule--helper update-clone: abort gracefully on missing .gitmodules | Stefan Beller | 2016-04-29 | 2 | -13/+33 |
| * | submodule init: fail gracefully with a missing .gitmodules file | Stefan Beller | 2016-04-29 | 2 | -3/+15 |
| * | submodule: port init from shell to C | Stefan Beller | 2016-04-17 | 4 | -45/+140 |
| * | submodule: port resolve_relative_url from shell to C | Stefan Beller | 2016-04-17 | 3 | -78/+258 |
| * | Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init | Junio C Hamano | 2016-04-14 | 461 | -26356/+54828 |
| |\ | |||||
| * \ | Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init | Junio C Hamano | 2016-04-14 | 2 | -23/+59 |
| |\ \ | |||||
* | | | | Twelfth batch for 2.9 | Junio C Hamano | 2016-05-13 | 1 | -0/+20 |
* | | | | Merge branch 'sb/submodule-module-list-pathspec-fix' | Junio C Hamano | 2016-05-13 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | submodule deinit test: fix broken && chain in subshell | Stefan Beller | 2016-05-03 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/commit-tree-ignore-commit-gpgsign' | Junio C Hamano | 2016-05-13 | 4 | -10/+16 |
|\ \ \ \ \ | |||||
| * | | | | | commit-tree: do not pay attention to commit.gpgsign | Junio C Hamano | 2016-05-03 | 4 | -10/+16 |
* | | | | | | git-multimail: update to release 1.3.1 | Matthieu Moy | 2016-05-13 | 4 | -4/+20 |
* | | | | | | Eleventh batch for 2.9 | Junio C Hamano | 2016-05-10 | 1 | -0/+21 |
* | | | | | | Merge branch 'svn/bad-ref' of git://bogomips.org/git-svn | Junio C Hamano | 2016-05-10 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Git/SVN: die when there is no commit metadata | Christian Couder | 2016-05-08 | 1 | -1/+2 |
* | | | | | | | Merge branch 'sk/gitweb-highlight-encoding' | Junio C Hamano | 2016-05-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gitweb: apply fallback encoding before highlight | Shin Kojima | 2016-05-03 | 1 | -0/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sb/clean-test-fix' | Junio C Hamano | 2016-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7300: mark test with SANITY | Stefan Beller | 2016-05-03 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'rn/glossary-typofix' | Junio C Hamano | 2016-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: fix typo 'In such these cases' | René Nyffenegger | 2016-05-02 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'ls/travis-submitting-patches' | Junio C Hamano | 2016-05-10 | 1 | -17/+63 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: add setup instructions for Travis CI | Lars Schneider | 2016-05-02 | 1 | -17/+63 |
* | | | | | | | | | | Merge branch 'js/close-packs-before-gc' | Junio C Hamano | 2016-05-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5510: run auto-gc in the foreground | SZEDER Gábor | 2016-05-02 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'ew/normal-to-e' | Junio C Hamano | 2016-05-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | .mailmap: update to my shorter email address | Eric Wong | 2016-05-02 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-05-10 | 3 | -10/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 | 2 | -3/+14 |
| * | | | | | | | | | | | | travis-ci: express Linux/OS X dependency versions more clearly | Lars Schneider | 2016-04-28 | 1 | -7/+10 |
| * | | | | | | | | | | | | travis-ci: update Git-LFS and P4 to the latest version | Lars Schneider | 2016-04-19 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge branch 'sb/misc-cleanups' | Junio C Hamano | 2016-05-10 | 2 | -10/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | submodule-config: don't shadow `cache` | Stefan Beller | 2016-04-28 | 1 | -6/+6 |
| * | | | | | | | | | | | | | config.c: drop local variable | Stefan Beller | 2016-04-28 | 1 | -4/+1 |
* | | | | | | | | | | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap' | Junio C Hamano | 2016-05-10 | 4 | -9/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | pack-objects: warn on split packs disabling bitmaps | Eric Wong | 2016-04-28 | 4 | -9/+23 |
* | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-05-06 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Almost ready for 2.8.3 | Junio C Hamano | 2016-05-06 | 1 | -0/+9 |
| * | | | | | | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maint | Junio C Hamano | 2016-05-06 | 3 | -11/+133 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'ky/imap-send-openssl-1.1.0' into maint | Junio C Hamano | 2016-05-06 | 5 | -28/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/replace-edit-use-editor-configuration' into maint | Junio C Hamano | 2016-05-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/apply' into maint | Junio C Hamano | 2016-05-06 | 1 | -15/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kn/for-each-tag-branch' into maint | Junio C Hamano | 2016-05-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | Tenth batch for 2.9 | Junio C Hamano | 2016-05-06 | 1 | -2/+30 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-05-06 | 3 | -4/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | diff: undocument the compaction heuristic knobs for experimentation | Junio C Hamano | 2016-05-02 | 2 | -11/+0 |
| * | | | | | | | | | | | | | | | | | | | xdiff: implement empty line chunk heuristic | Stefan Beller | 2016-04-19 | 5 | -0/+50 |
| * | | | | | | | | | | | | | | | | | | | xdiff: add recs_match helper function | Jacob Keller | 2016-04-18 | 1 | -4/+10 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |