summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t6044: replace seq by test_seqjs/t6044-use-test-seqJohannes Sixt2016-05-181-2/+2
* t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-121-0/+153
* Third batch for post 2.8 cycleJunio C Hamano2016-04-081-0/+24
* Merge branch 'ss/msvc'Junio C Hamano2016-04-083-2/+6
|\
| * MSVC: use shipped headers instead of fallback definitionsss/msvcSven Strickroth2016-03-302-1/+5
| * MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any moreSven Strickroth2016-03-301-1/+1
* | Merge branch 'oa/doc-diff-check'Junio C Hamano2016-04-081-2/+2
|\ \
| * | Documentation: git diff --check detects conflict markersoa/doc-diff-checkOri Avtalion2016-03-291-2/+2
* | | Merge branch 'pb/opt-cmdmode-doc'Junio C Hamano2016-04-081-0/+7
|\ \ \
| * | | api-parse-options.txt: document OPT_CMDMODE()pb/opt-cmdmode-docPranit Bauva2016-03-251-0/+7
| |/ /
* | | Merge branch 'nd/apply-report-skip'Junio C Hamano2016-04-081-0/+2
|\ \ \
| * | | apply: report patch skipping in verbose modend/apply-report-skipNguyễn Thái Ngọc Duy2016-03-241-0/+2
* | | | Merge branch 'nd/apply-doc'Junio C Hamano2016-04-081-1/+3
|\ \ \ \
| * | | | git-apply.txt: mention the behavior inside a subdirnd/apply-docNguyễn Thái Ngọc Duy2016-03-241-0/+2
| * | | | git-apply.txt: remove a spaceNguyễn Thái Ngọc Duy2016-03-241-1/+1
| | |/ / | |/| |
* | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-0812-14/+57
|\ \ \ \
| * | | | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-2312-14/+57
* | | | | Second batch for post 2.8 cycleJunio C Hamano2016-04-062-2/+51
* | | | | Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-063-6/+60
|\ \ \ \ \
| * | | | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tagsLaurent Arnoud2016-03-223-6/+60
* | | | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-068-19/+172
|\ \ \ \ \ \
| * | | | | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERSJeff King2016-03-232-1/+15
| * | | | | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-014-14/+133
| * | | | | | quote: implement sq_quotef()Jacob Keller2016-03-012-0/+16
| * | | | | | submodule: fix segmentation fault in submodule--helper cloneJacob Keller2016-03-011-3/+3
| * | | | | | submodule: fix submodule--helper clone usageJacob Keller2016-03-011-1/+1
| * | | | | | submodule: check argc count for git submodule--helper cloneJacob Keller2016-03-011-0/+4
| * | | | | | submodule: don't pass empty string arguments to submodule--helper cloneJacob Keller2016-03-011-2/+2
* | | | | | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-062-5/+15
|\ \ \ \ \ \ \
| * | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-232-5/+15
* | | | | | | | Merge branch 'ss/commit-squash-msg'Junio C Hamano2016-04-062-1/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-212-1/+38
* | | | | | | | | Merge branch 'sb/rebase-x'Junio C Hamano2016-04-063-22/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3404: cleanup double empty lines between testssb/rebase-xStefan Beller2016-03-181-6/+0
| * | | | | | | | | rebase: decouple --exec from --interactiveStefan Beller2016-03-183-16/+10
* | | | | | | | | | Merge branch 'jk/test-httpd-config-nosystem'Junio C Hamano2016-04-061-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envjk/test-httpd-config-nosystemJeff King2016-03-181-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/send-email-rtrim-mailrc-alias'Junio C Hamano2016-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | send-email: ignore trailing whitespace in mailrc alias filejk/send-email-rtrim-mailrc-aliasJeff King2016-03-181-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/credential-cache-comment-exit'Junio C Hamano2016-04-061-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | credential-cache--daemon: clarify "exit" action semanticsjk/credential-cache-comment-exitJeff King2016-03-181-1/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sb/clone-t57-t56'Junio C Hamano2016-04-0610-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone tests: rename t57* => t56*sb/clone-t57-t56Stefan Beller2016-03-1610-0/+0
* | | | | | | | | | | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-063-0/+81
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-userLars Schneider2016-03-153-0/+81
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file'Junio C Hamano2016-04-061-0/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: talk about pager in api-trace.txtcc/doc-recommend-performance-trace-to-fileChristian Couder2016-03-071-0/+43
* | | | | | | | | | | | Merge branch 'pb/t7502-drop-dup'Junio C Hamano2016-04-061-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/t7502 : drop duplicate testpb/t7502-drop-dupPranit Bauva2016-03-111-5/+0
* | | | | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict'Junio C Hamano2016-04-062-4/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \