summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-151-0/+12
|\
| * mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2017-11-021-1/+7
| * mingw: add experimental feature to redirect standard handlesJohannes Schindelin2017-11-021-0/+6
* | Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2017-11-151-0/+19
|\ \
| * | t0302: check helper can handle empty credentialsJakub Bereżański2017-11-011-0/+19
| |/
* | Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano2017-11-151-4/+10
|\ \
| * | t5580: add Cygwin supportAdam Dinwoodie2017-11-011-4/+10
| * | Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano2017-10-231-1/+1
| |\ \
| * \ \ Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintJunio C Hamano2017-10-231-0/+142
| |\ \ \
| * \ \ \ Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2017-10-231-1/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/worktree-kill-parse-ref' into maintJunio C Hamano2017-10-231-0/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-1812-62/+74
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/fsck-null-return-from-lookup' into maintJunio C Hamano2017-10-181-0/+22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/qsort-s' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mr/doc-negative-pathspec' into maintJunio C Hamano2017-10-181-1/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ks/test-readme-phrasofix' into maintJunio C Hamano2017-10-181-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/drop-sha1-entry-pos' into maintJunio C Hamano2017-10-182-11/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/ref-filter-empty-modifier' into maintJunio C Hamano2017-10-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/request-pull-phrasofix' into maintJunio C Hamano2017-10-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-10-181-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2017-10-181-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/test-lint-echo-e' into maintJunio C Hamano2017-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano2017-10-183-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2017-10-181-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/send-email-cc-cruft' into maintJunio C Hamano2017-10-181-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/complete-checkout' into maintJunio C Hamano2017-11-151-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | completion: add remaining flags to checkoutThomas Braun2017-10-251-0/+4
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-151-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | check-ref-format --branch: do not expand @{...} outside repositoryJunio C Hamano2017-10-171-0/+16
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t5601-copy-workaround' into maintJunio C Hamano2017-11-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | t5601: rm the target file of cp that could still be executingJunio C Hamano2017-10-171-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-151-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | sequencer: pass absolute GIT_DIR to exec commandsJacob Keller2017-11-021-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/submodule-in-excluded' into maintJunio C Hamano2017-11-151-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | status: do not get confused by submodules in excluded directoriesJohannes Schindelin2017-10-261-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maintJunio C Hamano2017-11-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | test-ref-store: avoid passing NULL to printfJeff King2017-10-211-1/+1
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-color-moved-fix' into maintJunio C Hamano2017-11-151-36/+177
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff: fix whitespace-skipping with --color-movedJeff King2017-10-211-0/+67
| * | | | | | | | | | | | | | | | | | | | | | | | | | t4015: test the output of "diff --color-moved -b"Jeff King2017-10-211-9/+64
| * | | | | | | | | | | | | | | | | | | | | | | | | | t4015: check "negative" case for "-w --color-moved"Jeff King2017-10-211-8/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | t4015: refactor --color-moved whitespace testJeff King2017-10-211-20/+29
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kd/auto-col-with-pager-fix' into maintJunio C Hamano2017-11-151-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | column: show auto columns when pager is activeKevin Daudt2017-10-171-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/ref-locking-fix'Junio C Hamano2017-10-261-0/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | files_transaction_prepare(): fix handling of ref lock failureMichael Haggerty2017-10-251-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | t1404: add a bunch of tests of D/F conflictsMichael Haggerty2017-10-251-0/+141
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-183-5/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | tag: respect color.ui configJeff King2017-10-172-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-171-1/+1