summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-141-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' into maintJunio C Hamano2016-04-141-0/+28
|\ \
| * | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-0/+28
* | | Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-141-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 'jk/startup-info' into maintJunio C Hamano2016-04-142-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 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-141-0/+4
|\ \ \ \ \
| * | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-emptyJeff King2016-03-051-0/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-141-0/+14
|\ \ \ \ \
| * | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-011-0/+14
* | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-141-0/+45
|\ \ \ \ \ \
| * | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-varsJeff King2016-02-291-2/+2
| * | | | | | t1515: add tests for rev-parse out-of-repo helpersJeff King2016-02-281-0/+45
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-141-0/+3
|\ \ \ \ \ \
| * | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-281-0/+3
| |/ / / / /
* | | | | | Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-141-5/+0
|\ \ \ \ \ \
| * | | | | | t/t7502 : drop duplicate testpb/t7502-drop-dupPranit Bauva2016-03-111-5/+0
* | | | | | | Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-141-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' into maintJunio C Hamano2016-04-1410-0/+0
|\ \ \ \ \ \ \
| * | | | | | | clone tests: rename t57* => t56*sb/clone-t57-t56Stefan Beller2016-03-1610-0/+0
| |/ / / / / /
| * | | | | | 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 'jc/index-pack' into maintJunio C Hamano2016-04-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-031-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keepJunio C Hamano2016-03-031-0/+6
* | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8'Junio C Hamano2016-03-242-11/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | mingw: skip some tests in t9115 due to file name issuesJohannes Schindelin2016-03-231-2/+2
| * | | | | | | | | | | | | | | | t1300: fix the new --show-origin tests on WindowsJohannes Schindelin2016-03-231-3/+6
| * | | | | | | | | | | | | | | | t1300-repo-config: make it resilient to being run via 'sh -x'Johannes Schindelin2016-03-231-6/+2
* | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-03-241-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | submodule: fix regression for deinit without submodulesStefan Beller2016-03-221-0/+13
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Revert "Merge branch 'nd/exclusion-regression-fix'"Junio C Hamano2016-03-182-155/+5
* | | | | | | | | | | | | | | | git-svn: fix URL canonicalization during init w/ SVN 1.7+Eric Wong2016-03-161-1/+1
* | | | | | | | | | | | | | | | t9117: test specifying full url to git svn init -TAdam Dinwoodie2016-03-161-0/+6
* | | | | | | | | | | | | | | | git-svn: shorten glob error messageEric Wong2016-03-153-9/+16
* | | | | | | | | | | | | | | | git-svn: loosen config globs limitationsVictor Leschuk2016-03-151-0/+222
* | | | | | | | | | | | | | | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-03-101-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t5510: do not leave changed cwdMichael J Gruber2016-03-041-4/+6
View Lorry Controller Status