summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva2016-05-051-14/+14
* t/t7507: improve test coveragePranit Bauva2016-05-051-0/+5
* t0040-parse-options: improve test coveragePranit Bauva2016-05-051-0/+114
* test-parse-options: print quiet as integerPranit Bauva2016-04-191-13/+13
* t0040-test-parse-options.sh: fix style issuesPranit Bauva2016-04-191-38/+38
* Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-0810-11/+35
|\
| * merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-2310-11/+35
* | Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-061-0/+41
|\ \
| * | tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tagsLaurent Arnoud2016-03-221-0/+41
* | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-063-0/+57
|\ \ \
| * | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERSJeff King2016-03-231-0/+14
| * | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-012-0/+43
* | | | Merge branch 'jv/merge-nothing-into-void'Junio C Hamano2016-04-061-0/+10
|\ \ \ \
| * | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-231-0/+10
| | |_|/ | |/| |
* | | | Merge branch 'ss/commit-squash-msg'Junio C Hamano2016-04-061-0/+28
|\ \ \ \
| * | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-0/+28
* | | | | Merge branch 'sb/rebase-x'Junio C Hamano2016-04-061-13/+6
|\ \ \ \ \
| * | | | | t3404: cleanup double empty lines between testssb/rebase-xStefan Beller2016-03-181-6/+0
| * | | | | rebase: decouple --exec from --interactiveStefan Beller2016-03-181-7/+6
| | |_|_|/ | |/| | |
* | | | | 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 '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-061-0/+61
|\ \ \ \ \
| * | | | | git-p4: map a P4 user to Git author name and email addressls/p4-map-userLars Schneider2016-03-151-0/+61
| |/ / / /
| * | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-101-0/+179
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-101-0/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-101-0/+25
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2016-03-102-13/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-101-0/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-102-26/+48
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/epipe-in-async' into maintJunio C Hamano2016-03-102-2/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-102-1/+24
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/work-tree-tests' into maintJunio C Hamano2016-03-103-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ 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-061-0/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-101-0/+25
| * | | | | | | | | | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-101-0/+39
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-063-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | clone: allow an explicit argument for parallel submodule clonesStefan Beller2016-03-011-0/+15
| * | | | | | | | | | | | | | | submodule update: expose parallelism to the userStefan Beller2016-03-011-0/+12
| * | | | | | | | | | | | | | | submodule update: direct error message to stderrStefan Beller2016-03-011-2/+2
| * | | | | | | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller2016-03-011-0/+14
* | | | | | | | | | | | | | | | Merge branch 'jk/startup-info'Junio C Hamano2016-04-032-5/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-071-0/+27
| * | | | | | | | | | | | | | | | setup: make startup_info available everywhereJeff King2016-03-061-5/+0
* | | | | | | | | | | | | | | | | Merge branch 'es/test-gpg-tags'Junio C Hamano2016-04-032-35/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t6302: skip only signed tags rather than all tests when GPG is missingEric Sunshine2016-03-061-19/+25
| * | | | | | | | | | | | | | | | | t6302: also test annotated in addition to signed tagsEric Sunshine2016-03-061-0/+25