summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/interpret-trailers-more'Junio C Hamano2014-12-222-9/+67
|\
| * trailer: add test with an old style conflict blockcc/interpret-trailers-moreChristian Couder2014-11-101-1/+31
| * trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder2014-11-101-0/+2
| * Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreJunio C Hamano2014-11-101-8/+34
| |\
| | * merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hintJunio C Hamano2014-10-281-8/+34
* | | Sync with v2.2.1Junio C Hamano2014-12-183-31/+102
|\ \ \
| * \ \ Sync with v2.1.4Junio C Hamano2014-12-173-31/+102
| |\ \ \
| | * \ \ Sync with v2.0.5Junio C Hamano2014-12-173-31/+102
| | |\ \ \
| | | * \ \ Sync with v1.9.5Junio C Hamano2014-12-173-31/+102
| | | |\ \ \
| | | | * \ \ Sync with v1.8.5.6Junio C Hamano2014-12-173-31/+102
| | | | |\ \ \
| | | | | * \ \ Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-173-31/+102
| | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | | * | fsck: complain about NTFS ".git" aliases in treesJohannes Schindelin2014-12-171-2/+7
| | | | | | * | read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-171-0/+13
| | | | | | * | fsck: complain about HFS+ ".git" aliases in treesJeff King2014-12-171-3/+5
| | | | | | * | read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-172-5/+25
| | | | | | * | fsck: notice .git case-insensitivelyJeff King2014-12-171-0/+1
| | | | | | * | t1450: refactor ".", "..", and ".git" fsck testsJeff King2014-12-171-30/+27
| | | | | | * | verify_dotfile(): reject .git case-insensitivelyJeff King2014-12-171-0/+1
| | | | | | * | read-tree: add tests for confusing paths like ".." and ".git"Jeff King2014-12-171-0/+32
* | | | | | | | Merge branch 'jk/push-simple'Junio C Hamano2014-12-121-2/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | push: truly use "simple" as default, not "upstream"jk/push-simpleJeff King2014-11-301-2/+30
* | | | | | | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-121-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4026: test "normal" colorjk/colors-fixJeff King2014-11-201-0/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/no-perl-tests'Junio C Hamano2014-12-123-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t960[34]: mark cvsimport tests as requiring perljk/no-perl-testsJeff King2014-11-182-3/+3
| * | | | | | | | | t0090: mark add-interactive test with PERL prerequisiteJeff King2014-11-181-1/+1
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
View Lorry Controller Status