summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/config-flip-xbit-back-after-checking'Junio C Hamano2014-12-051-0/+7
|\
| * create_default_files(): don't set u+x bit on $GIT_DIR/configmh/config-flip-xbit-back-after-checkingMichael Haggerty2014-11-181-0/+7
* | Merge branch 'jh/empty-notes'Junio C Hamano2014-12-051-696/+645
|\ \
| * | t3301: modernize styleJohan Herland2014-11-141-699/+601
| * | notes: empty notes should be shown by 'git log'Johan Herland2014-11-121-0/+12
| * | builtin/notes: add --allow-empty, to allow storing empty notesJohan Herland2014-11-121-1/+9
| * | t3301: verify that 'git notes' removes empty notes by defaultJohan Herland2014-11-101-0/+27
* | | Merge branch 'jk/checkout-from-tree'Junio C Hamano2014-12-051-0/+17
|\ \ \
| * | | checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-131-0/+17
* | | | Merge branch 'tb/no-relative-file-url'Junio C Hamano2014-11-191-1/+1
|\ \ \ \
| * | | | t5705: the file:// URL should be absolutetb/no-relative-file-urlTorsten Bögershausen2014-11-131-1/+1
| * | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-291-0/+9
| |\ \ \ \
* | \ \ \ \ Merge branch 'da/difftool'Junio C Hamano2014-11-181-0/+5
|\ \ \ \ \ \
| * | | | | | difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-141-0/+5
* | | | | | | Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-121-18/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | t1410: fix breakage on case-insensitive filesystemsjk/fetch-reflog-df-conflictJeff King2014-11-101-18/+18
* | | | | | | Merge branch 'tm/line-log-first-parent'Junio C Hamano2014-11-061-0/+5
|\ \ \ \ \ \ \
| * | | | | | | line-log: fix crash when --first-parent is usedtm/line-log-first-parentTzvetan Mikov2014-11-041-0/+5
* | | | | | | | Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-062-0/+74
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | ignore stale directories when checking reflog existenceJeff King2014-11-041-0/+34
| * | | | | | | fetch: load all default config at startupJeff King2014-11-041-0/+40
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs/grep-color-words'Junio C Hamano2014-10-311-0/+94
|\ \ \ \ \ \ \
| * | | | | | | grep: add color.grep.matchcontext and color.grep.matchselectedrs/grep-color-wordsRené Scharfe2014-10-281-0/+94
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'da/difftool'Junio C Hamano2014-10-291-0/+51
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | difftool: add support for --trust-exit-codeDavid Aguilar2014-10-281-0/+43
| * | | | | | difftool--helper: exit when reading a prompt answer failsJohannes Sixt2014-10-271-0/+8
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-075-0/+49
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-292-7/+83
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-291-0/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-291-0/+22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-291-0/+104
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-292-0/+107
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/lib-gpg-ro-safety'Junio C Hamano2014-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/lib-gpg: make gpghome files writablemg/lib-gpg-ro-safetyMichael J Gruber2014-10-271-0/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2014-10-294-0/+181
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | repack: pack objects mentioned by the indexJeff King2014-10-191-0/+13
| * | | | | | | | | | | | rev-list: add --indexed-objects optionJeff King2014-10-191-0/+23
| * | | | | | | | | | | | t5516: test pushing a tag of an otherwise unreferenced blobJeff King2014-10-191-0/+13
| * | | | | | | | | | | | write_sha1_file: freshen existing objectsJeff King2014-10-161-0/+27
| * | | | | | | | | | | | pack-objects: match prune logic for discarding objectsJeff King2014-10-161-38/+55
| * | | | | | | | | | | | prune: keep objects reachable from recent objectsJeff King2014-10-161-0/+88
* | | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-241-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | push: heed user.signingkey for signed pushesMichael J Gruber2014-10-241-0/+44
* | | | | | | | | | | | | | Merge branch 'wk/t1304-wo-USER'Junio C Hamano2014-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t1304: Set LOGNAME even if USER is unset or nullwk/t1304-wo-USERW. Trevor King2014-10-191-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Junio C Hamano2014-10-241-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splittingJeff King2014-10-191-0/+9
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-211-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directoryDavid Aguilar2014-10-161-0/+23
* | | | | | | | | | | | | | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-211-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status