aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar2016-03-10
| * | | | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-10
* | | | | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: allow an explicit argument for parallel submodule clonesStefan Beller2016-03-01
| * | | | | | | | | | submodule update: expose parallelism to the userStefan Beller2016-03-01
| * | | | | | | | | | submodule helper: remove double 'fatal: ' prefixStefan Beller2016-03-01
| * | | | | | | | | | git submodule update: have a dedicated helper for cloningStefan Beller2016-03-01
| * | | | | | | | | | run_processes_parallel: rename parameters for the callbacksStefan Beller2016-03-01
| * | | | | | | | | | run_processes_parallel: treat output of children as byte arrayStefan Beller2016-03-01
| * | | | | | | | | | submodule update: direct error message to stderrStefan Beller2016-03-01
| * | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller2016-03-01
| * | | | | | | | | | submodule-config: drop check against NULLStefan Beller2016-03-01
| * | | | | | | | | | submodule-config: keep update strategy aroundStefan Beller2016-03-01
* | | | | | | | | | | Merge branch 'ss/receive-pack-parse-options'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/receive-pack.c: use parse_options APISidhant Sharma [:tk]2016-03-01
* | | | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits'Junio C Hamano2016-04-06
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersSaurav Sachidanand2016-03-01
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | First batch for post 2.8 cycleJunio C Hamano2016-04-03
* | | | | | | | | | | | Sync with Git 2.8.1Junio C Hamano2016-04-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Git 2.8.1v2.8.1Junio C Hamano2016-04-03