Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tags | Laurent Arnoud | 2016-03-22 | 3 | -6/+60 | |
* | | | | | | | | | | | | Merge branch 'jk/submodule-c-credential' | Junio C Hamano | 2016-04-06 | 8 | -19/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS | Jeff King | 2016-03-23 | 2 | -1/+15 | |
| * | | | | | | | | | | | | git: submodule honor -c credential.* from command line | Jacob Keller | 2016-03-01 | 4 | -14/+133 | |
| * | | | | | | | | | | | | quote: implement sq_quotef() | Jacob Keller | 2016-03-01 | 2 | -0/+16 | |
| * | | | | | | | | | | | | submodule: fix segmentation fault in submodule--helper clone | Jacob Keller | 2016-03-01 | 1 | -3/+3 | |
| * | | | | | | | | | | | | submodule: fix submodule--helper clone usage | Jacob Keller | 2016-03-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | submodule: check argc count for git submodule--helper clone | Jacob Keller | 2016-03-01 | 1 | -0/+4 | |
| * | | | | | | | | | | | | submodule: don't pass empty string arguments to submodule--helper clone | Jacob Keller | 2016-03-01 | 1 | -2/+2 | |
* | | | | | | | | | | | | | Merge branch 'jv/merge-nothing-into-void' | Junio C Hamano | 2016-04-06 | 2 | -5/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-void | Junio C Hamano | 2016-03-23 | 2 | -5/+15 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ss/commit-squash-msg' | Junio C Hamano | 2016-04-06 | 2 | -1/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msg | Sven Strickroth | 2016-03-21 | 2 | -1/+38 | |
* | | | | | | | | | | | | | | Merge branch 'sb/rebase-x' | Junio C Hamano | 2016-04-06 | 3 | -22/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t3404: cleanup double empty lines between testssb/rebase-x | Stefan Beller | 2016-03-18 | 1 | -6/+0 | |
| * | | | | | | | | | | | | | | rebase: decouple --exec from --interactive | Stefan Beller | 2016-03-18 | 3 | -16/+10 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/test-httpd-config-nosystem' | Junio C Hamano | 2016-04-06 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envjk/test-httpd-config-nosystem | Jeff King | 2016-03-18 | 1 | -0/+1 | |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/send-email-rtrim-mailrc-alias' | Junio C Hamano | 2016-04-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | send-email: ignore trailing whitespace in mailrc alias filejk/send-email-rtrim-mailrc-alias | Jeff King | 2016-03-18 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jk/credential-cache-comment-exit' | Junio C Hamano | 2016-04-06 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | credential-cache--daemon: clarify "exit" action semanticsjk/credential-cache-comment-exit | Jeff King | 2016-03-18 | 1 | -1/+10 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'sb/clone-t57-t56' | Junio C Hamano | 2016-04-06 | 10 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | clone tests: rename t57* => t56*sb/clone-t57-t56 | Stefan Beller | 2016-03-16 | 10 | -0/+0 | |
* | | | | | | | | | | | | | | | | Merge branch 'ls/p4-map-user' | Junio C Hamano | 2016-04-06 | 3 | -0/+81 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-user | Lars Schneider | 2016-03-15 | 3 | -0/+81 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file' | Junio C Hamano | 2016-04-06 | 1 | -0/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Documentation: talk about pager in api-trace.txtcc/doc-recommend-performance-trace-to-file | Christian Couder | 2016-03-07 | 1 | -0/+43 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'pb/t7502-drop-dup' | Junio C Hamano | 2016-04-06 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t/t7502 : drop duplicate testpb/t7502-drop-dup | Pranit Bauva | 2016-03-11 | 1 | -5/+0 | |
* | | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-delete-delete-conflict' | Junio C Hamano | 2016-04-06 | 2 | -4/+85 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflict | David Aguilar | 2016-03-10 | 2 | -1/+35 | |
| * | | | | | | | | | | | | | | | | | mergetool: support delete/delete conflicts | David Aguilar | 2016-03-10 | 2 | -3/+50 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update' | Junio C Hamano | 2016-04-06 | 18 | -62/+445 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | clone: allow an explicit argument for parallel submodule clones | Stefan Beller | 2016-03-01 | 3 | -7/+33 | |
| * | | | | | | | | | | | | | | | | | | submodule update: expose parallelism to the user | Stefan Beller | 2016-03-01 | 4 | -2/+34 | |
| * | | | | | | | | | | | | | | | | | | submodule helper: remove double 'fatal: ' prefix | Stefan Beller | 2016-03-01 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | git submodule update: have a dedicated helper for cloning | Stefan Beller | 2016-03-01 | 2 | -34/+259 | |
| * | | | | | | | | | | | | | | | | | | run_processes_parallel: rename parameters for the callbacks | Stefan Beller | 2016-03-01 | 2 | -7/+7 | |
| * | | | | | | | | | | | | | | | | | | run_processes_parallel: treat output of children as byte array | Stefan Beller | 2016-03-01 | 3 | -4/+16 | |
| * | | | | | | | | | | | | | | | | | | submodule update: direct error message to stderr | Stefan Beller | 2016-03-01 | 2 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config option | Stefan Beller | 2016-03-01 | 5 | -2/+38 | |
| * | | | | | | | | | | | | | | | | | | submodule-config: drop check against NULL | Stefan Beller | 2016-03-01 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | submodule-config: keep update strategy around | Stefan Beller | 2016-03-01 | 4 | -0/+52 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ss/receive-pack-parse-options' | Junio C Hamano | 2016-04-06 | 1 | -33/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | builtin/receive-pack.c: use parse_options APIss/receive-pack-parse-options | Sidhant Sharma [:tk] | 2016-03-01 | 1 | -33/+20 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits' | Junio C Hamano | 2016-04-06 | 3 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bits | Saurav Sachidanand | 2016-03-01 | 3 | -9/+9 | |
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | First batch for post 2.8 cycle | Junio C Hamano | 2016-04-03 | 2 | -1/+85 | |
* | | | | | | | | | | | | | | | | | | | | Sync with Git 2.8.1 | Junio C Hamano | 2016-04-03 | 4 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |