aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-10-26
|\
| * rev-list: use hdr_termination instead of a always using a newlineJacob Keller2016-10-20
* | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-10-26
|\ \
| * | t3700: fix broken test under !SANITYJunio C Hamano2016-10-20
* | | Merge branch 'pb/test-parse-options-expect'Junio C Hamano2016-10-26
|\ \ \
| * | | t0040: convert all possible tests to use `test-parse-options --expect`Pranit Bauva2016-10-17
* | | | Merge branch 'va/i18n'Junio C Hamano2016-10-26
|\ \ \ \
| * | | | i18n: convert mark error messages for translationVasco Almeida2016-10-17
| * | | | i18n: apply: mark error message for translationVasco Almeida2016-10-17
* | | | | Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano2016-10-26
|\ \ \ \ \
| * | | | | fetch: use "quick" has_sha1_file for tag followingJeff King2016-10-14
* | | | | | Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2016-10-26
|\ \ \ \ \ \
| * | | | | | merge-base: handle --fork-point without reflogJeff King2016-10-12
* | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \
| * | | | | | | t1512: become resilient to GETTEXT_POISON buildVasco Almeida2016-10-12
* | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \
| * | | | | | | | worktree: allow the main brach of a bare repository to be checked outDennis Kaarsemaker2016-10-14
| * | | | | | | | Merge branch 'kd/mailinfo-quoted-string' into maintJunio C Hamano2016-10-11
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'mg/gpg-richer-status'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gpg-interface: use more status lettersMichael J Gruber2016-10-12
* | | | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-files: add pathspec matching for submodulesBrandon Williams2016-10-10
| * | | | | | | | | | | ls-files: pass through safe options for --recurse-submodulesBrandon Williams2016-10-10
| * | | | | | | | | | | ls-files: optionally recurse into submodulesBrandon Williams2016-10-10
* | | | | | | | | | | | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff: introduce diff.wsErrorHighlight optionJunio C Hamano2016-10-04
| * | | | | | | | | | | | t4015: split out the "setup" part of ws-error-highlight testJunio C Hamano2016-10-04
* | | | | | | | | | | | | Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mergetool: honor -O<orderfile>David Aguilar2016-10-11
| * | | | | | | | | | | | | mergetool: honor diff.orderFileDavid Aguilar2016-10-11
* | | | | | | | | | | | | | Merge branch 'jk/ref-symlink-loop'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2016-10-10
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-10
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | alternates: use fspathcmp to detect duplicatesJeff King2016-10-10
| * | | | | | | | | | | | | | | | | | | | | | sha1_file: always allow relative paths to alternatesJeff King2016-10-10
| * | | | | | | | | | | | | | | | | | | | | | count-objects: report alternates via verbose modeJeff King2016-10-10
| * | | | | | | | | | | | | | | | | | | | | | t5613: clarify "too deep" recursion testsJeff King2016-10-10
| * | | | | | | | | | | | | | | | | | | | | | t5613: do not chdir in main processJeff King2016-10-03