summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/in-pack-size-measurement'Junio C Hamano2013-07-181-43/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | cat-file: split --batch input lines on whitespaceJeff King2013-07-121-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | cat-file: add --batch-check=<format>Jeff King2013-07-121-0/+6
| * | | | | | | | | | | | | | | | | | | | | | | | t1006: modernize output comparisonsJeff King2013-07-111-43/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/mediawiki-preview'Junio C Hamano2013-07-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | wrap-for-bin: make bin-wrappers chainableBenoit Person2013-07-081-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/commit-invalid-utf8'Junio C Hamano2013-07-181-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | commit: reject non-charactersPeter Krefting2013-07-091-0/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | commit: reject overlong UTF-8 sequencesbrian m. carlson2013-07-051-0/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | commit: reject invalid UTF-8 codepointsbrian m. carlson2013-07-051-0/+8
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/overlapping-range-set'Junio C Hamano2013-07-181-3/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | range_set: fix coalescing bug when range is a subset of anotherEric Sunshine2013-07-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | t4211: fix broken test when one -L range is subset of anotherEric Sunshine2013-07-092-5/+133
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-clone-shared-no-connectivity-validation'Junio C Hamano2013-07-181-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: drop connectivity check for local clonesJeff King2013-07-081-1/+7
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/rebase-reflog-message-reword'Junio C Hamano2013-07-181-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: use a better reflog messageRamkumar Ramachandra2013-06-241-0/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/submodule-clone-depth'Junio C Hamano2013-07-152-7/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add --depth to submodule update/addFredrik Gustafsson2013-07-032-7/+32
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cp/submodule-custom-update'Junio C Hamano2013-07-151-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | submodule update: allow custom command to update submodule working treeChris Packham2013-07-031-0/+29
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/format-patch-from'Junio C Hamano2013-07-151-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | teach format-patch to place other authors into in-body "From"Jeff King2013-07-031-0/+43
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mv/merge-ff-tristate'Junio C Hamano2013-07-151-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-021-3/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell'Junio C Hamano2013-07-122-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lint: detect 'export FOO=bar'Thomas Rast2013-07-081-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t9902: fix 'test A == B' to use = operatorThomas Rast2013-07-081-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ml/cygwin-does-not-have-fifo'Junio C Hamano2013-07-121-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib.sh - cygwin does not have usable FIFOsMark Levedahl2013-07-051-1/+8
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t5551-posix-sed-bre' into maintJunio C Hamano2013-07-041-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-07-042-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/wildmatch-foldcase' into maintJunio C Hamano2013-07-041-6/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/log-follow-with-combined' into maintJunio C Hamano2013-07-041-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/die-on-missing-upstream' into maintJunio C Hamano2013-07-041-10/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "remote tracking" to "remote-tracking"Michael Schubert2013-07-031-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-124-135/+257
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4205 (log-pretty-formats): avoid using `sed`Alexey Shumkin2013-07-051-16/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commit...Alexey Shumkin2013-07-051-13/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4205, t6006, t7102: make functions better readableAlexey Shumkin2013-07-053-25/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4205 (log-pretty-formats): revert back single quotesAlexey Shumkin2013-07-051-53/+53
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1Alexey Shumkin2013-07-054-18/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4205: replace .\+ with ..* in sed commandsBrian Gernhardt2013-07-011-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-264-27/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: Add failing tests: --format output should honor logOutputEncodingAlexey Shumkin2013-06-264-97/+199
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-22/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-3/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6006 (rev-list-format): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-63/+77
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t1512-fix'Junio C Hamano2013-07-111-10/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |