summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH]jt/format-patch-rfcJosh Triplett2016-09-211-0/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-261-0/+216
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-191-0/+29
| * | | | | | | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-191-0/+187
* | | | | | | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-09-261-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | pretty: let %C(auto) reset all attributesRené Scharfe2016-09-191-1/+1
* | | | | | | | | Merge branch 'jk/rebase-i-drop-ident-check'Junio C Hamano2016-09-211-0/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-checkJeff King2016-07-291-0/+47
* | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-09-212-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | notes: spell first word of error messages in lowercaseVasco Almeida2016-09-151-1/+1
| * | | | | | | | | i18n: blame: mark error messages for translationVasco Almeida2016-09-151-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig'Junio C Hamano2016-09-211-6/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: show base info before email signaturejt/format-patch-base-info-above-sigJosh Triplett2016-09-151-6/+27
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ks/perf-build-with-autoconf'Junio C Hamano2016-09-211-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/perf/run: copy config.mak.autogen & friends to build areaks/perf-build-with-autoconfKirill Smelkov2016-09-151-1/+7
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano2016-09-211-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-contextRené Scharfe2016-09-141-0/+25
| * | | | | | | | | Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-09-081-1/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maintJunio C Hamano2016-09-081-0/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/difftool-command-not-found' into maintJunio C Hamano2016-09-081-0/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-081-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pull-signed-tag' into maintJunio C Hamano2016-09-081-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/test-lint-pathname' into maintJunio C Hamano2016-09-081-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-081-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-083-48/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status