diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:16 +0900 |
| commit | dae82ecf147c58c6862d349fb8421d81f5868616 (patch) | |
| tree | 5ef032267002e423398cce3032059e5fc74fd33d /builtin/merge-tree.c | |
| parent | Merge branch 'jt/fetch-no-update-shallow-in-proto-v2' (diff) | |
| parent | fast-import: fix erroneous handling of get-mark with empty orphan commits (diff) | |
| download | tgif-dae82ecf147c58c6862d349fb8421d81f5868616.tar.xz | |
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 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions