aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* merge-octopus: abort if index does not match HEADElijah Newren2016-04-12
* t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-12
* Third batch for post 2.8 cycleJunio C Hamano2016-04-08
* Merge branch 'ss/msvc'Junio C Hamano2016-04-08
|\
| * MSVC: use shipped headers instead of fallback definitionsSven Strickroth2016-03-30
| * MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any moreSven Strickroth2016-03-30
* | Merge branch 'oa/doc-diff-check'Junio C Hamano2016-04-08
|\ \
| * | Documentation: git diff --check detects conflict markersOri Avtalion2016-03-29
* | | Merge branch 'pb/opt-cmdmode-doc'Junio C Hamano2016-04-08
|\ \ \
| * | | api-parse-options.txt: document OPT_CMDMODE()Pranit Bauva2016-03-25
| |/ /
* | | Merge branch 'nd/apply-report-skip'Junio C Hamano2016-04-08
|\ \ \
| * | | apply: report patch skipping in verbose modeNguyễn Thái Ngọc Duy2016-03-24
* | | | Merge branch 'nd/apply-doc'Junio C Hamano2016-04-08
|\ \ \ \
| * | | | git-apply.txt: mention the behavior inside a subdirNguyễn Thái Ngọc Duy2016-03-24
| * | | | git-apply.txt: remove a spaceNguyễn Thái Ngọc Duy2016-03-24
| | |/ / | |/| |
* | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-08
|\ \ \ \
| * | | | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-23
* | | | | Second batch for post 2.8 cycleJunio C Hamano2016-04-06
* | | | | Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-06
|\ \ \ \ \
| * | | | | tag: add the option to force signing of annotated tagsLaurent Arnoud2016-03-22
* | | | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-06
|\ \ \ \ \ \
| * | | | | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERSJeff King2016-03-23
| * | | | | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-01
| * | | | | | quote: implement sq_quotef()Jacob Keller2016-03-01
| * | | | | | submodule: fix segmentation fault in submodule--helper cloneJacob Keller2016-03-01
| * | | | | | submodule: fix submodule--helper clone usageJacob Keller2016-03-01
| * | | | | | submodule: check argc count for git submodule--helper cloneJacob Keller2016-03-01
| * | | | | | submodule: don't pass empty string arguments to submodule--helper cloneJacob Keller2016-03-01
* | | | | | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \
| * | | | | | | merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2016-03-23
* | | | | | | | Merge branch 'ss/commit-squash-msg'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: do not lose SQUASH_MSG contentsSven Strickroth2016-03-21
* | | | | | | | | Merge branch 'sb/rebase-x'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t3404: cleanup double empty lines between testsStefan Beller2016-03-18
| * | | | | | | | | rebase: decouple --exec from --interactiveStefan Beller2016-03-18
* | | | | | | | | | Merge branch 'jk/test-httpd-config-nosystem'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envJeff King2016-03-18
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/send-email-rtrim-mailrc-alias'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | send-email: ignore trailing whitespace in mailrc alias fileJeff King2016-03-18
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/credential-cache-comment-exit'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | credential-cache--daemon: clarify "exit" action semanticsJeff King2016-03-18
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sb/clone-t57-t56'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone tests: rename t57* => t56*Stefan Beller2016-03-16
* | | | | | | | | | | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: map a P4 user to Git author name and email addressLars Schneider2016-03-15
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: talk about pager in api-trace.txtChristian Couder2016-03-07
* | | | | | | | | | | | Merge branch 'pb/t7502-drop-dup'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/t7502 : drop duplicate testPranit Bauva2016-03-11
* | | | | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \ \ \ \