summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/merge-quit'Junio C Hamano2019-06-131-0/+26
|\
| * merge: add --quitNguyễn Thái Ngọc Duy2019-05-191-0/+26
* | Merge branch 'ab/fail-prereqs-in-test'Junio C Hamano2019-06-137-10/+43
|\ \
| * | tests: add a special setup where prerequisites failÆvar Arnfjörð Bjarmason2019-05-147-10/+43
* | | Merge branch 'nd/corrupt-worktrees'Junio C Hamano2019-06-131-0/+12
|\ \ \
| * | | worktree add: be tolerant of corrupt worktreesNguyễn Thái Ngọc Duy2019-05-151-0/+12
| | |/ | |/|
* | | Merge branch 'js/rebase-cleanup'Junio C Hamano2019-06-131-1/+1
|\ \ \
| * | | t3400: stop referring to the scripted rebaseJohannes Schindelin2019-05-151-1/+1
| | |/ | |/|
* | | Merge branch 'nd/worktree-name-sanitization'Junio C Hamano2019-06-131-0/+5
|\ \ \
| * | | worktree add: sanitize worktree namesNguyễn Thái Ngọc Duy2019-05-151-0/+5
* | | | Merge branch 'en/fast-export-encoding'Junio C Hamano2019-06-134-9/+91
|\ \ \ \
| * | | | fast-export: do automatic reencoding of commit messages only if requestedElijah Newren2019-05-141-3/+35
| * | | | fast-export: avoid stripping encoding header if we cannot reencodeElijah Newren2019-05-142-0/+22
| * | | | fast-import: support 'encoding' commit headerElijah Newren2019-05-141-0/+20
| * | | | t9350: fix encoding test to actually test reencodingElijah Newren2019-05-142-10/+18
* | | | | Merge branch 'sb/format-patch-base-patch-id-fix'Junio C Hamano2019-06-131-3/+29
|\ \ \ \ \
| * | | | | format-patch: make --base patch-id output stableStephen Boyd2019-05-081-4/+4
| * | | | | format-patch: inform user that patch-id generation is unstableStephen Boyd2019-05-081-5/+31
| |/ / / /
* | | | | Merge branch 'nd/init-relative-template-fix'Junio C Hamano2019-06-132-4/+4
|\ \ \ \ \
| * | | | | init: make --template path relative to $CWDNguyễn Thái Ngọc Duy2019-05-132-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ab/send-email-transferencoding-fix'Junio C Hamano2019-06-131-20/+82
|\ \ \ \ \
| * | | | | send-email: fix regression in sendemail.identity parsingÆvar Arnfjörð Bjarmason2019-05-291-0/+64
| * | | | | send-email: fix broken transferEncoding testsÆvar Arnfjörð Bjarmason2019-05-191-24/+11
| * | | | | send-email: remove cargo-culted multi-patch pattern in testsÆvar Arnfjörð Bjarmason2019-05-191-7/+7
| * | | | | send-email: do defaults -> config -> getopt in that orderÆvar Arnfjörð Bjarmason2019-05-131-1/+12
* | | | | | Merge branch 'en/merge-directory-renames-fix'Junio C Hamano2019-06-061-0/+116
|\ \ \ \ \ \
| * | | | | | merge-recursive: restore accidentally dropped setting of pathElijah Newren2019-06-051-0/+116
* | | | | | | Merge branch 'cc/list-objects-filter-wo-sparse-path'Junio C Hamano2019-06-032-84/+26
|\ \ \ \ \ \ \
| * | | | | | | list-objects-filter: disable 'sparse:path' filtersChristian Couder2019-05-292-84/+26
* | | | | | | | Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-05-302-7/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: mark a couple more test cases as requiring `rebase -p`Johannes Schindelin2019-05-282-7/+13
* | | | | | | | | Merge branch 'sg/trace2-rename'Junio C Hamano2019-05-305-32/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | trace2: rename environment variables to GIT_TRACE2*SZEDER Gábor2019-05-285-32/+32
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/diff-parseopt'Junio C Hamano2019-05-304-0/+94
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | diff-parseopt: restore -U (no argument) behaviorNguyễn Thái Ngọc Duy2019-05-294-0/+94
* | | | | | | | | Merge branch 'jk/get-oid-indexed-object-name'Junio C Hamano2019-05-191-6/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | get_oid: handle NULL repo->indexJeff King2019-05-151-6/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'tz/test-lib-check-working-jgit'Junio C Hamano2019-05-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: try harder to ensure a working jgitTodd Zullinger2019-05-151-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'es/check-non-portable-pre-5.10'Junio C Hamano2019-05-191-4/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | check-non-portable-shell: support Perl versions older than 5.10Eric Sunshine2019-05-131-4/+5
* | | | | | | | | | Merge branch 'js/fsmonitor-refresh-after-discarding-index'Junio C Hamano2019-05-192-1/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsmonitor: force a refresh after the index was discardedJohannes Schindelin2019-05-081-1/+1
| * | | | | | | | | | fsmonitor: demonstrate that it is not refreshed after discard_index()Johannes Schindelin2019-05-082-1/+31
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/t5580-unc-alternate-test'Junio C Hamano2019-05-191-0/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5580: verify that alternates can be UNC pathsJohannes Schindelin2019-05-071-0/+12
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bl/t4253-exit-code-from-format-patch'Junio C Hamano2019-05-191-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4253-am-keep-cr-dos: avoid using pipesBoxuan Li2019-05-071-2/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dl/difftool-mergetool'Junio C Hamano2019-05-192-61/+126
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | difftool: fallback on merge.guitoolDenton Liu2019-05-131-0/+16
View Lorry Controller Status