summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/test-lib-simplify-expr-away'Junio C Hamano2016-05-031-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-awaySZEDER Gábor2016-04-221-5/+5
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/remove-unused'Junio C Hamano2016-05-034-27/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | wrapper.c: delete dead function git_mkstemps()nd/remove-unusedNguyễn Thái Ngọc Duy2016-04-222-19/+0
| * | | | | | | | | | | | | | | | | | | | | | | dir.c: remove dead function fnmatch_icase()Nguyễn Thái Ngọc Duy2016-04-222-8/+0
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/name-rev-use-oldest-ref'Junio C Hamano2016-05-032-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-222-7/+14
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jd/p4-jobs-in-commit'Junio C Hamano2016-05-034-42/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commitJan Durovec2016-04-193-0/+120
| * | | | | | | | | | | | | | | | | | | | | | | git-p4: clean-up code style in testsJan Durovec2016-04-192-42/+42
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'en/merge-fixes'Junio C Hamano2016-05-031-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: do not check working copy when creating a virtual merge baseen/merge-fixesElijah Newren2016-04-121-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: remove duplicate codeElijah Newren2016-04-121-2/+0
* | | | | | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-05-021-0/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Start preparing for 2.8.3Junio C Hamano2016-05-021-0/+61
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/use-write-script-more' into maintJunio C Hamano2016-05-023-18/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \