Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | p4211: explicitly disable renames in no-rename testjk/perf-any-version | Jeff King | 2016-06-22 | 1 | -3/+3 |
* | t/perf: fix regression in testing older versions of git | Jeff King | 2016-06-22 | 2 | -3/+14 |
* | perf: make the tests work in worktrees | Johannes Schindelin | 2016-05-13 | 1 | -7/+7 |
* | perf: let's disable symlinks when they are not available | Johannes Schindelin | 2016-05-13 | 1 | -1/+4 |
* | 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 highlightsk/gitweb-highlight-encoding | 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 SANITYsb/clean-test-fix | 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'rn/glossary-typofix | 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 CIls/travis-submitting-patches | 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 foregroundjs/close-packs-before-gc | 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 addressew/normal-to-e | 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`sb/misc-cleanups | 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 bitmapsew/doc-split-pack-disables-bitmap | 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 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' | Junio C Hamano | 2016-05-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0 | Lars Schneider | 2016-04-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | t9824: fix broken &&-chain in a subshell | SZEDER Gábor | 2016-04-24 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-05-06 | 21 | -98/+109 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | match-trees: convert several leaf functions to use struct object_id | brian m. carlson | 2016-04-25 | 1 | -15/+15 |
| * | | | | | | | | | | | | | | | | | tree-walk: convert tree_entry_extract() to use struct object_id | brian m. carlson | 2016-04-25 | 5 | -17/+17 |
| * | | | | | | | | | | | | | | | | | struct name_entry: use struct object_id instead of unsigned char sha1[20] | brian m. carlson | 2016-04-25 | 17 | -48/+48 |
| * | | | | | | | | | | | | | | | | | match-trees: convert shift_tree() and shift_tree_by() to use object_id | brian m. carlson | 2016-04-19 | 4 | -27/+27 |
| * | | | | | | | | | | | | | | | | | test-match-trees: convert to use struct object_id | brian m. carlson | 2016-04-19 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | | | | sha1-name: introduce a get_oid() function | brian m. carlson | 2016-04-19 | 2 | -0/+11 |