Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-svn: warn instead of dying when commit data is missingew/svn-bad-ref | Eric Wong | 2016-07-06 | 1 | -2/+6 |
* | Git/SVN: die when there is no commit metadata | Christian Couder | 2016-05-08 | 1 | -1/+2 |
* | 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 |
* | | | | | | | | | | Merge branch 'bw/rebase-merge-entire-branch' | Junio C Hamano | 2016-05-06 | 3 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-rebase--merge: don't include absent parent as a basebw/rebase-merge-entire-branch | Ben Woosley | 2016-04-24 | 3 | -3/+14 |
* | | | | | | | | | | | Merge branch 'jc/drop-git-spec-in' | Junio C Hamano | 2016-05-06 | 2 | -343/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Makefile: remove dependency on git.specjc/drop-git-spec-in | Dennis Kaarsemaker | 2016-04-27 | 1 | -1/+1 |
| * | | | | | | | | | | | Makefile: stop pretending to support rpmbuild | Junio C Hamano | 2016-04-06 | 2 | -342/+5 |
* | | | | | | | | | | | | Merge branch 'js/http-custom-headers' | Junio C Hamano | 2016-05-06 | 7 | -10/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | http: support sending custom HTTP headers | Johannes Schindelin | 2016-04-27 | 7 | -10/+61 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' | Junio C Hamano | 2016-05-06 | 3 | -3/+100 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | clone: add `--shallow-submodules` flag | Stefan Beller | 2016-04-26 | 3 | -3/+102 |
* | | | | | | | | | | | | | Merge branch 'ld/p4-test-py3' | Junio C Hamano | 2016-05-06 | 2 | -6/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3 | Luke Diamand | 2016-04-26 | 1 | -1/+1 |
| * | | | | | | | | | | | | | git-p4 tests: work with python3 as well as python2 | Luke Diamand | 2016-04-26 | 2 | -5/+6 |
| * | | | | | | | | | | | | | git-p4 tests: cd to / before running python | Luke Diamand | 2016-04-26 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'sb/config-exit-status-list' | Junio C Hamano | 2016-05-06 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | config doc: improve exit code listingsb/config-exit-status-list | Stefan Beller | 2016-04-26 | 1 | -3/+3 |
* | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-05-03 | 8 | -143/+476 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | git-multimail: update to release 1.3.0 | Matthieu Moy | 2016-05-03 | 8 | -143/+476 |
* | | | | | | | | | | | | | | Ninth batch for 2.9 | Junio C Hamano | 2016-05-03 | 1 | -46/+30 |
* | | | | | | | | | | | | | | Merge branch 'nf/mergetool-prompt' | Junio C Hamano | 2016-05-03 | 4 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt | Nikola Forró | 2016-04-25 | 4 | -5/+5 |
* | | | | | | | | | | | | | | | Merge branch 'jd/send-email-to-whom' | Junio C Hamano | 2016-05-03 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | send-email: fix grammo in the prompt that asks e-mail recipientsjd/send-email-to-whom | Junio C Hamano | 2016-04-25 | 1 | -2/+3 |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'rt/string-list-lookup-cleanup' | Junio C Hamano | 2016-05-03 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | string_list: use string-list API in unsorted_string_list_lookup()rt/string-list-lookup-cleanup | Ralf Thielow | 2016-04-25 | 1 | -4/+4 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jk/fix-attribute-macro-in-2.5' | Junio C Hamano | 2016-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | remote.c: spell __attribute__ correctlyjk/fix-attribute-macro-in-2.5 | Jeff King | 2016-04-25 | 1 | -1/+1 |