summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | test-lib: handle TEST_OUTPUT_DIRECTORY with spacesJeff King2016-10-211-2/+2
* | | | | | | | | | | | Merge branch 'mm/send-email-cc-cruft-after-address'Junio C Hamano2016-10-262-4/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9000-addresses: update expected results after fixMatthieu Moy2016-10-211-4/+4
| * | | | | | | | | | | | parse_mailboxes: accept extra text after <...> addressMatthieu Moy2016-10-141-0/+29
* | | | | | | | | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-10-261-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rev-list: use hdr_termination instead of a always using a newlineJacob Keller2016-10-201-0/+14
* | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t3700: fix broken test under !SANITYtg/add-chmod+x-fixJunio C Hamano2016-10-201-0/+1
* | | | | | | | | | | | | | | Merge branch 'pb/test-parse-options-expect'Junio C Hamano2016-10-261-170/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expectPranit Bauva2016-10-171-170/+13
* | | | | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-10-262-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | i18n: convert mark error messages for translationVasco Almeida2016-10-171-1/+5
| * | | | | | | | | | | | | | | | i18n: apply: mark error message for translationVasco Almeida2016-10-171-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano2016-10-261-0/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-141-0/+99
* | | | | | | | | | | | | | | | | Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2016-10-261-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflogJeff King2016-10-121-0/+6
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t1512: become resilient to GETTEXT_POISON buildjk/ambiguous-short-object-namesVasco Almeida2016-10-121-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'Junio C Hamano2016-10-261-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | worktree: allow the main brach of a bare repository to be checked outdk/worktree-dup-checkout-with-bare-is-okDennis Kaarsemaker2016-10-141-0/+8
| * | | | | | | | | | | | | | | | | | Merge branch 'kd/mailinfo-quoted-string' into maintJunio C Hamano2016-10-115-33/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/gpg-richer-status'Junio C Hamano2016-10-261-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | gpg-interface: use more status lettersmg/gpg-richer-statusMichael J Gruber2016-10-121-1/+12
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano2016-10-261-0/+210
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | ls-files: add pathspec matching for submodulesbw/ls-files-recurse-submodulesBrandon Williams2016-10-101-3/+105
| * | | | | | | | | | | | | | | | | | | | ls-files: pass through safe options for --recurse-submodulesBrandon Williams2016-10-101-4/+12
| * | | | | | | | | | | | | | | | | | | | ls-files: optionally recurse into submodulesBrandon Williams2016-10-101-0/+100
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-261-18/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-041-0/+35
| * | | | | | | | | | | | | | | | | | | t4015: split out the "setup" part of ws-error-highlight testJunio C Hamano2016-10-041-18/+21
* | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-171-0/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-111-0/+27
| * | | | | | | | | | | | | | | | | | | | mergetool: honor diff.orderFileDavid Aguilar2016-10-111-0/+33
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/ref-symlink-loop'Junio C Hamano2016-10-171-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2016-10-101-0/+5
| | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-031-29/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-292-0/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-291-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-292-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-291-0/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-291-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-291-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-291-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-291-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-171-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-101-0/+36
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-171-89/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | alternates: use fspathcmp to detect duplicatesJeff King2016-10-101-0/+17
View Lorry Controller Status