summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: do not look at the index during recursive mergeew/empty-merge-with-dirty-index-maintJunio C Hamano2018-01-091-0/+50
* merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-221-1/+1
* t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren2017-12-221-5/+21
* Merge branch 'tz/redirect-fix' into maintJunio C Hamano2017-12-061-1/+1
|\
| * t/lib-gpg: fix gpgconf stderr redirect to /dev/nullTodd Zullinger2017-11-141-1/+1
* | Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano2017-12-062-5/+5
|\ \
| * | notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderrTodd Zullinger2017-11-152-5/+5
* | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maintJunio C Hamano2017-12-061-0/+36
|\ \ \
| * | | merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-wayElijah Newren2017-11-151-1/+1
| * | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller2017-11-121-0/+36
* | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2017-12-061-0/+14
|\ \ \ \
| * | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-lineRené Scharfe2017-11-171-0/+14
| | |/ / | |/| |
* | | | Merge branch 'ew/rebase-mboxrd' into maintJunio C Hamano2017-12-061-0/+22
|\ \ \ \
| * | | | rebase: use mboxrd format to avoid split errorsew/rebase-mboxrdEric Wong2017-11-181-0/+22
* | | | | Merge branch 'mh/avoid-rewriting-packed-refs' into maintJunio C Hamano2017-12-061-0/+118
|\ \ \ \ \
| * | | | | files-backend: don't rewrite the `packed-refs` file unnecessarilymh/avoid-rewriting-packed-refsMichael Haggerty2017-10-301-2/+2
| * | | | | t1409: check that `packed-refs` is not rewritten unnecessarilyMichael Haggerty2017-10-271-0/+118
* | | | | | Merge branch 'cb/t4201-robustify' into maintJunio C Hamano2017-11-212-5/+7
|\ \ \ \ \ \
| * | | | | | t4201: make use of abbreviation in the test more robustcb/t4201-robustifyCharles Bailey2017-11-132-5/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'tz/fsf-address-update' into maintJunio C Hamano2017-11-211-3/+1
|\ \ \ \ \ \
| * | | | | | Replace Free Software Foundation address in license noticesTodd Zullinger2017-11-091-3/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sr/wrapper-quote-filenames' into maintJunio C Hamano2017-11-212-2/+2
|\ \ \ \ \ \
| * | | | | | wrapper.c: consistently quote filenames in error messagessr/wrapper-quote-filenamesSimon Ruderich2017-11-062-2/+2
| |/ / / / /
* | | | | | Merge branch 'bw/rebase-i-ignored-submodule-fix' into maintJunio C Hamano2017-11-211-0/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | wt-status: actually ignore submodules when requestedbw/status-ignore-submodules-from-configbw/rebase-i-ignored-submodule-fixBrandon Williams2017-11-071-0/+17
* | | | | | 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 supportad/5580-unc-tests-on-cygwinAdam 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status