summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mp/t7060-diff-index-test'Junio C Hamano2015-09-141-1/+1
|\
| * t7060: actually test "git diff-index --cached -M"mp/t7060-diff-index-testMatthieu Prat2015-09-021-1/+1
* | Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2015-09-081-0/+48
|\ \
| * | am: match --signoff to the original scripted versionjc/builtin-am-signoff-regression-fixJunio C Hamano2015-09-061-0/+48
* | | Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano2015-09-031-0/+36
|\ \ \
| * | | rerere: release lockfile in non-writing functionsjk/am-rerere-lock-fixJeff King2015-09-011-0/+36
* | | | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-09-021-0/+14
|\ \ \ \
| * | | | trailer: support multiline titlecc/trailers-corner-case-fixChristian Couder2015-08-311-0/+14
* | | | | Merge branch 'ee/clean-test-fixes'Junio C Hamano2015-09-021-12/+4
|\ \ \ \ \
| * | | | | t7300: fix broken && chainsee/clean-test-fixesErik Elfström2015-08-311-12/+4
* | | | | | Merge branch 'jk/log-missing-default-HEAD'Junio C Hamano2015-09-021-0/+14
|\ \ \ \ \ \
| * | | | | | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEADJeff King2015-08-311-0/+14
* | | | | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-011-0/+10
|\ \ \ \ \ \ \
| * | | | | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-311-0/+10
| * | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-251-0/+106
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/test-with-x' into maintJunio C Hamano2015-08-251-2/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/export-worktree' into maintJunio C Hamano2015-08-191-0/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-191-39/+60
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-191-0/+52
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/archive-zip-many'Junio C Hamano2015-09-011-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | archive-zip: support more than 65535 entriesrs/archive-zip-manyRené Scharfe2015-08-281-1/+1
| * | | | | | | | | | | | | t5004: test ZIP archives with many entriesRené Scharfe2015-08-281-0/+40
| * | | | | | | | | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-031-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-031-0/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-031-0/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-031-1/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-fold-case-client-specs'Junio C Hamano2015-09-011-0/+200
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specsLars Schneider2015-08-281-0/+200
* | | | | | | | | | | | | | | | | | Merge branch 'sg/describe-contains'Junio C Hamano2015-08-311-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | describe --contains: default to HEAD when no commit-ish is givensg/describe-containsSZEDER Gábor2015-08-251-0/+8
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-312-0/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-0/+39
| * | | | | | | | | | | | | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-0/+40
| * | | | | | | | | | | | | | | | | | | notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller2015-08-171-0/+12
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-alias-pager-config-key-warnings'Junio C Hamano2015-08-311-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warningsJeff King2015-08-241-0/+9
* | | | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-311-0/+153
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | submodule: allow erroneous values for the fetchRecurseSubmodules optionhv/submodule-configHeiko Voigt2015-08-191-0/+35
| * | | | | | | | | | | | | | | | | | | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-191-2/+35
| * | | | | | | | | | | | | | | | | | | | submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt2015-08-191-0/+85
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/config-name-only'Junio C Hamano2015-08-311-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | config: add '--name-only' option to list only variable namesSZEDER Gábor2015-08-101-0/+22
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2015-08-281-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | trailer: retitle a test and correct an in-comment messageChristian Couder2015-08-261-1/+1
| * | | | | | | | | | | | | | | | | | | | trailer: ignore first line of messageChristian Couder2015-08-211-1/+14
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dt/untracked-subdir'Junio C Hamano2015-08-281-2/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | untracked cache: fix entry invalidationdt/untracked-subdirNguyễn Thái Ngọc Duy2015-08-191-1/+27
| * | | | | | | | | | | | | | | | | | | untracked-cache: fix subdirectory handlingDavid Turner2015-08-191-1/+71
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/t3020-typofix'Junio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t3020: fix typo in test descriptionsg/t3020-typofixSZEDER Gábor2015-08-201-1/+1