summaryrefslogtreecommitdiff
path: root/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-25 07:41:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-25 07:41:16 (GMT)
commitdae82ecf147c58c6862d349fb8421d81f5868616 (patch)
tree5ef032267002e423398cce3032059e5fc74fd33d /blame.c
parent732ce7aaca15d32c1284d85498a0f2bda7406b95 (diff)
parentcf7b857a77bda6a9a93e2cde2f6ae1764e7a2517 (diff)
downloadgit-dae82ecf147c58c6862d349fb8421d81f5868616.zip
git-dae82ecf147c58c6862d349fb8421d81f5868616.tar.gz
git-dae82ecf147c58c6862d349fb8421d81f5868616.tar.bz2
Merge branch 'en/fast-import-parsing-fix'
"git fast-import" update. * en/fast-import-parsing-fix: fast-import: fix erroneous handling of get-mark with empty orphan commits fast-import: only allow cat-blob requests where it makes sense fast-import: check most prominent commands first git-fast-import.txt: fix wording about where ls command can appear t9300: demonstrate bug with get-mark and empty orphan commits
Diffstat (limited to 'blame.c')
0 files changed, 0 insertions, 0 deletions