Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | parse-options.c: make OPTION_COUNTUP respect "unspecified" values | Pranit Bauva | 2016-05-05 | 1 | -14/+14 |
* | t/t7507: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+5 |
* | t0040-parse-options: improve test coverage | Pranit Bauva | 2016-05-05 | 1 | -0/+114 |
* | test-parse-options: print quiet as integer | Pranit Bauva | 2016-04-19 | 1 | -13/+13 |
* | t0040-test-parse-options.sh: fix style issues | Pranit Bauva | 2016-04-19 | 1 | -38/+38 |
* | Merge branch 'jc/merge-refuse-new-root' | Junio C Hamano | 2016-04-08 | 10 | -11/+35 |
|\ | |||||
| * | merge: refuse to create too cool a merge by default | Junio C Hamano | 2016-03-23 | 10 | -11/+35 |
* | | Merge branch 'la/tag-force-signing-annotated-tags' | Junio C Hamano | 2016-04-06 | 1 | -0/+41 |
|\ \ | |||||
| * | | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tags | Laurent Arnoud | 2016-03-22 | 1 | -0/+41 |
* | | | Merge branch 'jk/submodule-c-credential' | Junio C Hamano | 2016-04-06 | 3 | -0/+57 |
|\ \ \ | |||||
| * | | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS | Jeff King | 2016-03-23 | 1 | -0/+14 |
| * | | | git: submodule honor -c credential.* from command line | Jacob Keller | 2016-03-01 | 2 | -0/+43 |
* | | | | Merge branch 'jv/merge-nothing-into-void' | Junio C Hamano | 2016-04-06 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-void | Junio C Hamano | 2016-03-23 | 1 | -0/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'ss/commit-squash-msg' | Junio C Hamano | 2016-04-06 | 1 | -0/+28 |
|\ \ \ \ | |||||
| * | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msg | Sven Strickroth | 2016-03-21 | 1 | -0/+28 |
* | | | | | Merge branch 'sb/rebase-x' | Junio C Hamano | 2016-04-06 | 1 | -13/+6 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 1 | -7/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 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 '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 | 1 | -0/+61 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-user | Lars Schneider | 2016-03-15 | 1 | -0/+61 |
| |/ / / / | |||||
| * | | | | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+179 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/config-set-in-non-repository' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sb/submodule-module-list-fix' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+25 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/grep-binary-workaround-in-test' into maint | Junio C Hamano | 2016-03-10 | 2 | -13/+17 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'nd/git-common-dir-fix' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint | Junio C Hamano | 2016-03-10 | 2 | -26/+48 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/epipe-in-async' into maint | Junio C Hamano | 2016-03-10 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/config-error' into maint | Junio C Hamano | 2016-03-10 | 2 | -1/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/work-tree-tests' into maint | Junio C Hamano | 2016-03-10 | 3 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | 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 | 1 | -0/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflict | David Aguilar | 2016-03-10 | 1 | -0/+25 |
| * | | | | | | | | | | | | | | | mergetool: support delete/delete conflicts | David Aguilar | 2016-03-10 | 1 | -0/+39 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update' | Junio C Hamano | 2016-04-06 | 3 | -2/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | clone: allow an explicit argument for parallel submodule clones | Stefan Beller | 2016-03-01 | 1 | -0/+15 |
| * | | | | | | | | | | | | | | | submodule update: expose parallelism to the user | Stefan Beller | 2016-03-01 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | submodule update: direct error message to stderr | Stefan Beller | 2016-03-01 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config option | Stefan Beller | 2016-03-01 | 1 | -0/+14 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/startup-info' | Junio C Hamano | 2016-04-03 | 2 | -5/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | grep: turn off gitlink detection for --no-index | Jeff King | 2016-03-07 | 1 | -0/+27 |
| * | | | | | | | | | | | | | | | | setup: make startup_info available everywhere | Jeff King | 2016-03-06 | 1 | -5/+0 |
* | | | | | | | | | | | | | | | | | Merge branch 'es/test-gpg-tags' | Junio C Hamano | 2016-04-03 | 2 | -35/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t6302: skip only signed tags rather than all tests when GPG is missing | Eric Sunshine | 2016-03-06 | 1 | -19/+25 |
| * | | | | | | | | | | | | | | | | | t6302: also test annotated in addition to signed tags | Eric Sunshine | 2016-03-06 | 1 | -0/+25 |