summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-101-0/+25
* mergetool: support delete/delete conflictsDavid Aguilar2016-03-101-0/+39
* Merge branch 'js/test-lib-windows-emulated-yes' into maintJunio C Hamano2016-02-171-2/+4
|\
| * test-lib: limit the output of the yes utilityjs/test-lib-windows-emulated-yesJohannes Schindelin2016-02-021-2/+4
* | Merge branch 'aw/push-force-with-lease-reporting' into maintJunio C Hamano2016-02-171-5/+10
|\ \
| * | push: fix ref status reporting for --force-with-leaseaw/push-force-with-lease-reportingAndrew Wheeler2016-02-011-5/+10
| |/
* | Merge branch 'js/xmerge-marker-eol' into maintJunio C Hamano2016-02-171-0/+13
|\ \
| * | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eolJohannes Schindelin2016-01-271-1/+2
| * | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-271-0/+12
* | | Merge branch 'sg/t6050-failing-editor-test-fix' into maintJunio C Hamano2016-02-051-3/+7
|\ \ \
| * | | t6050-replace: make failing editor test more robustsg/t6050-failing-editor-test-fixSZEDER Gábor2016-01-051-3/+7
* | | | Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-052-0/+11
|\ \ \ \
| * | | | resolve_gitlink_ref: ignore non-repository pathsjk/ref-cache-non-repository-optimJeff King2016-01-252-0/+11
| | |_|/ | |/| |
* | | | Merge branch 'js/dirname-basename' into maintJunio C Hamano2016-02-051-0/+3
|\ \ \ \
| * | | | t0060: verify that basename() and dirname() work as expectedJohannes Schindelin2016-01-121-0/+3
| | |_|/ | |/| |
* | | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-051-0/+6
|\ \ \ \
| * | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-0/+6
| |/ / /
| * | | Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2016-01-041-0/+29
| |\ \ \
| * \ \ \ Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-041-0/+22
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-053-52/+38
|\ \ \ \ \ \
| * | | | | | tag: do not show ambiguous tag names as "tags/foo"jk/list-tag-2.7-regressionJeff King2016-01-263-0/+28
| * | | | | | t6300: use test_atom for some un-modern testsJeff King2016-01-251-52/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/sanity' into maintJunio C Hamano2016-02-051-5/+13
|\ \ \ \ \ \
| * | | | | | test-lib: clarify and tighten SANITYjk/sanityJunio C Hamano2016-01-191-5/+13
* | | | | | | Merge branch 'jk/filter-branch-no-index' into maintJunio C Hamano2016-02-051-0/+8
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: resolve $commit^{tree} in no-index casejk/filter-branch-no-indexJeff King2016-01-191-0/+8
* | | | | | | | Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-051-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/exclusion-regression-fix' into maintJunio C Hamano2016-02-051-25/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"Nguyễn Thái Ngọc Duy2016-01-081-25/+0
* | | | | | | | | Merge branch 'dk/reflog-walk-with-non-commit' into maintJunio C Hamano2016-02-051-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reflog-walk: don't segfault on non-commit sha1's in the reflogdk/reflog-walk-with-non-commitDennis Kaarsemaker2016-01-051-0/+13
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'ls/p4-keep-empty-commits' into maintJunio C Hamano2015-12-151-0/+134
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'ew/send-email-mutt-alias-fix' into maintJunio C Hamano2016-02-051-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-send-email: do not double-escape quotes from muttew/send-email-mutt-alias-fixEric Wong2016-01-041-0/+15
* | | | | | | | | | | Merge branch 'nd/stop-setenv-work-tree' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"nd/stop-setenv-work-treeNguyễn Thái Ngọc Duy2015-12-221-1/+1
* | | | | | | | | | | Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-281-1/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: reduce number of server queries for fetchessh/p4-multi-depotSam Hocevar2015-12-211-1/+1
| * | | | | | | | | | | git-p4: failing test case for skipping changes with multiple depotsLuke Diamand2015-12-141-1/+27
* | | | | | | | | | | | Merge branch 'jk/pending-keep-tag-name'Junio C Hamano2015-12-281-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | revision.c: propagate tag names from pending arrayjk/pending-keep-tag-nameJeff King2015-12-171-0/+29
* | | | | | | | | | | | Merge branch 'jk/symbolic-ref-maint'Junio C Hamano2015-12-281-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | t1401: test reflog creation for git-symbolic-refjk/symbolic-ref-maintJeff King2015-12-211-0/+16
| * | | | | | | | | | | symbolic-ref: propagate error code from create_symref()Jeff King2015-12-211-0/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bc/format-patch-null-from-line'Junio C Hamano2015-12-211-0/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format-patch: check that header line has expected formatbc/format-patch-null-from-linebrian m. carlson2015-12-151-0/+7
| * | | | | | | | | | | format-patch: add an option to suppress commit hashbrian m. carlson2015-12-151-0/+7
* | | | | | | | | | | | Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-211-1/+216
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | push: follow the "last one wins" convention for --recurse-submodulesmc/push-recurse-submodules-configMike Crowe2015-12-041-0/+41
View Lorry Controller Status