summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-svn: warn instead of dying when commit data is missingew/svn-bad-refEric Wong2016-07-061-2/+6
* Git/SVN: die when there is no commit metadataChristian Couder2016-05-081-1/+2
* 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
* | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0'Junio C Hamano2016-05-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0Lars Schneider2016-04-291-1/+1
| * | | | | | | | t9824: fix broken &&-chain in a subshellSZEDER Gábor2016-04-241-1/+1
* | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-05-0621-98/+109
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | match-trees: convert several leaf functions to use struct object_idbrian m. carlson2016-04-251-15/+15
| * | | | | | | | | tree-walk: convert tree_entry_extract() to use struct object_idbrian m. carlson2016-04-255-17/+17
| * | | | | | | | | struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-2517-48/+48
| * | | | | | | | | match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson2016-04-194-27/+27
| * | | | | | | | | test-match-trees: convert to use struct object_idbrian m. carlson2016-04-191-7/+7
| * | | | | | | | | sha1-name: introduce a get_oid() functionbrian m. carlson2016-04-192-0/+11
* | | | | | | | | | Merge branch 'bw/rebase-merge-entire-branch'Junio C Hamano2016-05-063-3/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-rebase--merge: don't include absent parent as a basebw/rebase-merge-entire-branchBen Woosley2016-04-243-3/+14
* | | | | | | | | | | Merge branch 'jc/drop-git-spec-in'Junio C Hamano2016-05-062-343/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Makefile: remove dependency on git.specjc/drop-git-spec-inDennis Kaarsemaker2016-04-271-1/+1
| * | | | | | | | | | | Makefile: stop pretending to support rpmbuildJunio C Hamano2016-04-062-342/+5
* | | | | | | | | | | | Merge branch 'js/http-custom-headers'Junio C Hamano2016-05-067-10/+61
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http: support sending custom HTTP headersJohannes Schindelin2016-04-277-10/+61
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru'Junio C Hamano2016-05-063-3/+100
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: add `--shallow-submodules` flagStefan Beller2016-04-263-3/+102
* | | | | | | | | | | | | Merge branch 'ld/p4-test-py3'Junio C Hamano2016-05-062-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3Luke Diamand2016-04-261-1/+1
| * | | | | | | | | | | | | git-p4 tests: work with python3 as well as python2Luke Diamand2016-04-262-5/+6
| * | | | | | | | | | | | | git-p4 tests: cd to / before running pythonLuke Diamand2016-04-261-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sb/config-exit-status-list'Junio C Hamano2016-05-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config doc: improve exit code listingsb/config-exit-status-listStefan Beller2016-04-261-3/+3
* | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-05-038-143/+476
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | git-multimail: update to release 1.3.0Matthieu Moy2016-05-038-143/+476
* | | | | | | | | | | | | | Ninth batch for 2.9Junio C Hamano2016-05-031-46/+30
* | | | | | | | | | | | | | Merge branch 'nf/mergetool-prompt'Junio C Hamano2016-05-034-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-254-5/+5
* | | | | | | | | | | | | | | Merge branch 'jd/send-email-to-whom'Junio C Hamano2016-05-031-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | send-email: fix grammo in the prompt that asks e-mail recipientsjd/send-email-to-whomJunio C Hamano2016-04-251-2/+3
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rt/string-list-lookup-cleanup'Junio C Hamano2016-05-031-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | string_list: use string-list API in unsorted_string_list_lookup()rt/string-list-lookup-cleanupRalf Thielow2016-04-251-4/+4
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/fix-attribute-macro-in-2.5'Junio C Hamano2016-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remote.c: spell __attribute__ correctlyjk/fix-attribute-macro-in-2.5Jeff King2016-04-251-1/+1