summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Ben Keene <seraphire@gmail.com>2020-02-14 14:44:46 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 08:58:53 -0800
commit1ec4a0a356f73ef0ab57d3903bd6667942a7052c (patch)
treec4f5d45b2865ada5af4fedb74e5564b481bc85d1 /Documentation/git-merge-one-file.txt
parentgit-p4: add p4 submit hooks (diff)
downloadtgif-1ec4a0a356f73ef0ab57d3903bd6667942a7052c.tar.xz
git-p4: add RCS keyword status message
During the p4 submit process, git-p4 will attempt to apply a patch to the files found in the p4 workspace. However, if P4 uses RCS keyword expansion, this patch may fail. When the patch fails, the user is alerted to the failure and that git-p4 will attempt to clear the expanded text from the files and re-apply the patch. The current version of git-p4 does not tell the user the result of the re-apply attempt after the RCS expansion has been removed which can be confusing. Add a new print statement after the git patch has been successfully applied when the RCS keywords have been cleansed. Signed-off-by: Ben Keene <seraphire@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions