summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* refs: resolve symbolic refs firstMichael Haggerty2016-06-131-0/+35
* ref_transaction_update(): check refname_is_safe() at a minimumMichael Haggerty2016-06-132-2/+2
* refs: don't dereference on renameDavid Turner2016-06-131-0/+9
* refs: make error messages more consistentMichael Haggerty2016-06-131-2/+2
* read_raw_ref(): don't get confused by an empty directoryMichael Haggerty2016-05-051-1/+1
* t1404: demonstrate a bug resolving referencesMichael Haggerty2016-05-051-1/+75
* Merge branch 'sb/submodule-path-misc-bugs'Junio C Hamano2016-04-252-5/+126
|\
| * t7407: make expectation as clear as possiblesb/submodule-path-misc-bugsStefan Beller2016-03-301-2/+6
| * submodule update: test recursive path reporting from subdirectoryStefan Beller2016-03-301-0/+20
| * submodule update: align reporting path for custom command executionStefan Beller2016-03-301-3/+26
| * submodule status: correct path handling in recursive submodulesStefan Beller2016-03-301-0/+21
| * submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-301-0/+33
| * submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-301-0/+20
* | Merge branch 'en/merge-trivial-fix'Junio C Hamano2016-04-251-1/+5
|\ \
| * | builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fixElijah Newren2016-04-121-1/+1
| * | t7605: add a testcase demonstrating a bug with trivial mergesElijah Newren2016-04-121-1/+5
* | | Merge branch 'en/merge-octopus-fix'Junio C Hamano2016-04-251-0/+153
|\ \ \
| * | | merge-octopus: abort if index does not match HEADen/merge-octopus-fixElijah Newren2016-04-121-3/+3
| * | | t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-121-0/+153
| |/ /
* | | Merge branch 'dt/pre-refs-backend'Junio C Hamano2016-04-252-11/+131
|\ \ \
| * | | refs: on symref reflog expire, lock symref not referrentdt/pre-refs-backendDavid Turner2016-04-101-0/+10
| * | | t1430: improve test coverage of deletion of badly-named refsMichael Haggerty2016-04-101-8/+96
| * | | t1430: test for-each-ref in the presence of badly-named refsMichael Haggerty2016-04-101-0/+16
| * | | t1430: don't rely on symbolic-ref for creating broken symrefsMichael Haggerty2016-04-101-2/+2
| * | | t1430: clean up broken refs/tags/shadowMichael Haggerty2016-04-101-1/+1
| * | | t1430: test the output and error of some commands more carefullyMichael Haggerty2016-04-101-6/+12
* | | | Merge branch 'jc/rerere-multi'Junio C Hamano2016-04-251-1/+169
|\ \ \ \
| * | | | rerere: adjust 'forget' to multi-variant world orderJunio C Hamano2016-04-061-0/+10
| * | | | rerere: gc and clearJunio C Hamano2016-04-061-6/+75
| * | | | rerere: do use multiple variantsJunio C Hamano2016-03-151-1/+1
| * | | | t4200: rerere a merge with two identical conflictsJunio C Hamano2016-03-151-0/+74
| * | | | rerere: handle leftover rr-cache/$ID directory and postimage filesJunio C Hamano2016-03-151-1/+16
* | | | | Merge branch 'jk/use-write-script-more'Junio C Hamano2016-04-223-18/+20
|\ \ \ \ \
| * | | | | t3404: use write_scriptjk/use-write-script-moreJunio C Hamano2016-04-121-4/+3
| * | | | | t1020: do not overuse printf and use write_scriptJunio C Hamano2016-04-111-5/+5
| * | | | | t5532: use write_scriptJeff King2016-04-101-9/+12
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ad/commit-have-m-option'Junio C Hamano2016-04-221-0/+20
|\ \ \ \ \
| * | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-optionJeff King2016-04-071-3/+3
| * | | | | commit: --amend -m '' silently fails to wipe messageAdam Dinwoodie2016-04-071-0/+20
* | | | | | Merge branch 'sb/submodule-helper-clone-regression-fix'Junio C Hamano2016-04-221-0/+41
|\ \ \ \ \ \
| * | | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-011-1/+1
| * | | | | | recursive submodules: test for relative pathsStefan Beller2016-03-311-0/+41
| * | | | | | Merge 'hv/submodule-config' to 'sb/submodule-helper'Junio C Hamano2015-08-191-0/+153
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-181-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-0/+12
* | | | | | | | | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-181-1/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-1/+22
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-131-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-051-0/+14
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-132-1/+106
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status