summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-102-1/+35
| * | | | | | | | | | | | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-102-3/+50
* | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-0618-62/+445
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | clone: allow an explicit argument for parallel submodule clonesStefan Beller2016-03-013-7/+33
| * | | | | | | | | | | | | | | | | | submodule update: expose parallelism to the userStefan Beller2016-03-014-2/+34
| * | | | | | | | | | | | | | | | | | submodule helper: remove double 'fatal: ' prefixStefan Beller2016-03-011-2/+2
| * | | | | | | | | | | | | | | | | | git submodule update: have a dedicated helper for cloningStefan Beller2016-03-012-34/+259
| * | | | | | | | | | | | | | | | | | run_processes_parallel: rename parameters for the callbacksStefan Beller2016-03-012-7/+7
| * | | | | | | | | | | | | | | | | | run_processes_parallel: treat output of children as byte arrayStefan Beller2016-03-013-4/+16
| * | | | | | | | | | | | | | | | | | submodule update: direct error message to stderrStefan Beller2016-03-012-4/+4
| * | | | | | | | | | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller2016-03-015-2/+38
| * | | | | | | | | | | | | | | | | | submodule-config: drop check against NULLStefan Beller2016-03-011-3/+3
| * | | | | | | | | | | | | | | | | | submodule-config: keep update strategy aroundStefan Beller2016-03-014-0/+52
* | | | | | | | | | | | | | | | | | | Merge branch 'ss/receive-pack-parse-options'Junio C Hamano2016-04-061-33/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | builtin/receive-pack.c: use parse_options APIss/receive-pack-parse-optionsSidhant Sharma [:tk]2016-03-011-33/+20
* | | | | | | | | | | | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits'Junio C Hamano2016-04-063-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bitsSaurav Sachidanand2016-03-013-9/+9
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | First batch for post 2.8 cycleJunio C Hamano2016-04-032-1/+85
* | | | | | | | | | | | | | | | | | | | Sync with Git 2.8.1Junio C Hamano2016-04-034-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \