diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:46 -0700 |
| commit | ca81676a105dbd387c28fbcc428e8959990678ec (patch) | |
| tree | 7a2fc7d8b19afd1cd616c4b54936cca96c325b4f /git.c | |
| parent | Merge branch 'al/bisect-first-parent' (diff) | |
| parent | t4140: test apply with i-t-a paths (diff) | |
| download | git-ca81676a105dbd387c28fbcc428e8959990678ec.tar.gz git-ca81676a105dbd387c28fbcc428e8959990678ec.zip | |
Merge branch 'rp/apply-cached-with-i-t-a'
Recent versions of "git diff-files" shows a diff between the index
and the working tree for "intent-to-add" paths as a "new file"
patch; "git apply --cached" should be able to take "git diff-files"
and should act as an equivalent to "git add" for the path, but the
command failed to do so for such a path.
* rp/apply-cached-with-i-t-a:
t4140: test apply with i-t-a paths
apply: make i-t-a entries never match worktree
apply: allow "new file" patches on i-t-a entries
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions