summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/qsort'Junio C Hamano2016-10-101-4/+2
|\
| * use QSORTRené Scharfe2016-09-291-4/+2
* | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-10-061-1/+1
|\ \
| * | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributesRené Scharfe2016-09-291-1/+1
* | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-061-0/+94
|\ \ \
| * | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-271-0/+94
* | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-062-1/+72
|\ \ \ \
| * | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-271-0/+14
| * | | | get_short_sha1: list ambiguous objects on errorJeff King2016-09-261-0/+24
| * | | | for_each_abbrev: drop duplicate objectsJeff King2016-09-261-0/+7
| * | | | sha1_array: let callbacks interrupt iterationJeff King2016-09-261-1/+2
| * | | | get_short_sha1: parse tags when looking for treeishJeff King2016-09-261-0/+7
| * | | | get_sha1: propagate flags to child functionsJeff King2016-09-261-1/+13
| * | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIEJeff King2016-09-261-0/+6
* | | | | Merge branch 'dt/tree-fsck'Junio C Hamano2016-10-032-4/+37
|\ \ \ \ \
| * | | | | fsck: handle bad trees like other errorsdt/tree-fsckDavid Turner2016-09-271-2/+14
| * | | | | tree-walk: be more specific about corrupt tree errorsJeff King2016-09-271-2/+23
| |/ / / /
* | | | | Merge branch 'kd/mailinfo-quoted-string'Junio C Hamano2016-10-035-33/+77
|\ \ \ \ \
| * | | | | mailinfo: unescape quoted-pair in header fieldskd/mailinfo-quoted-stringKevin Daudt2016-09-285-0/+42
| * | | | | t5100-mailinfo: replace common path prefix with variableKevin Daudt2016-09-281-33/+35
| | |/ / / | |/| | |
| * | | | Merge branch 'js/t9903-chaining' into maintJunio C Hamano2016-09-191-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ep/use-git-trace-curl-in-tests' into maintJunio C Hamano2016-09-194-9/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/t6026-clean-up' into maintJunio C Hamano2016-09-191-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-191-7/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/submodule-anchor-git-dir' into maintJunio C Hamano2016-09-191-0/+35
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/test-lib-drop-pid-from-results' into maintJunio C Hamano2016-09-191-2/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/init-core-worktree-in-multi-worktree-world'Junio C Hamano2016-10-031-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | init: do not set unnecessary core.worktreeNguyễn Thái Ngọc Duy2016-09-251-0/+2
| * | | | | | | | | | | init: correct re-initialization from a linked worktreeNguyễn Thái Ngọc Duy2016-09-251-0/+15
* | | | | | | | | | | | Merge branch 'ik/gitweb-force-highlight'Junio C Hamano2016-10-031-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: use highlight's shebang detectionik/gitweb-force-highlightIan Kelling2016-09-251-0/+8
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jt/mailinfo-fold-in-body-headers'Junio C Hamano2016-09-2910-3/+75
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | mailinfo: handle in-body header continuationsJonathan Tan2016-09-2110-3/+75
* | | | | | | | | | | | Merge branch 'rt/rebase-i-broken-insn-advise'Junio C Hamano2016-09-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-adviseRalf Thielow2016-09-071-3/+3
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-262-0/+61
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t3700-add: do not check working tree file mode without POSIXPERMJohannes Sixt2016-09-211-4/+2
| * | | | | | | | | | | | t3700-add: create subdirectory gentlyJohannes Sixt2016-09-211-1/+1
| * | | | | | | | | | | | add: modify already added files when --chmod is givenThomas Gummerer2016-09-151-0/+50
| * | | | | | | | | | | | update-index: add test for chmod flagsThomas Gummerer2016-09-141-0/+13
* | | | | | | | | | | | | Merge branch 'js/regexec-buf'Junio C Hamano2016-09-261-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | regex: use regexec_buf()Johannes Schindelin2016-09-211-1/+1
| * | | | | | | | | | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and failsJohannes Schindelin2016-09-211-0/+22
* | | | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation'Junio C Hamano2016-09-262-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguationNguyễn Thái Ngọc Duy2016-09-212-0/+21
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'va/i18n-more'Junio C Hamano2016-09-264-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | i18n: notes-merge: mark die messages for translationVasco Almeida2016-09-211-1/+1
| * | | | | | | | | | | | | | i18n: connect: mark die messages for translationVasco Almeida2016-09-191-1/+1
| * | | | | | | | | | | | | | i18n: commit: mark message for translationVasco Almeida2016-09-192-5/+5
* | | | | | | | | | | | | | | Merge branch 'jt/format-patch-rfc'Junio C Hamano2016-09-261-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \