diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-08-04 21:51:29 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-04 22:02:11 -0700 |
| commit | 38a824fe050c4da3f2e0979a94062119080a77a0 (patch) | |
| tree | 5fa13fce27bacc6d7eff4b77ee92e8750221af92 /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | builtin-am: extract patch and commit info with git-mailinfo (diff) | |
| download | git-38a824fe050c4da3f2e0979a94062119080a77a0.tar.gz git-38a824fe050c4da3f2e0979a94062119080a77a0.zip | |
builtin-am: apply patch with git-apply
Implement applying the patch to the index using git-apply.
If a file is unchanged but stat-dirty, git-apply may erroneously fail to
apply patches, thinking that they conflict with a dirty working tree.
As such, since 2a6f08a (am: refresh the index at start and --resolved,
2011-08-15), git-am will refresh the index before applying patches.
Re-implement this behavior.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions