]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/howto/revert-branch-rebase.txt
Merge branch 'rp/apply-cached-with-i-t-a'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Aug 2020 00:02:46 +0000 (17:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Aug 2020 00:02:46 +0000 (17:02 -0700)
commitca81676a105dbd387c28fbcc428e8959990678ec
tree7a2fc7d8b19afd1cd616c4b54936cca96c325b4f
parent47f0f94bc796037c43000a9852cdf9209a3c3274
parent4c025c667ee29dd5e9260f423e8b0b3cc37e5e8c
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
apply.c