Merge branch 'ot/ref-filter-plug-leaks'

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 6c0017e36eb1a9e30558a1043f598ad2734c1fca..f0a0280954f18532a1f12d4e5e6cae094c778784 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -177,8 +177,8 @@ Unshelving will take a shelved P4 changelist, and produce the equivalent git com
 in the branch refs/remotes/p4-unshelved/<changelist>.
 
 The git commit is created relative to the current origin revision (HEAD by default).
-If the shelved changelist's parent revisions differ, git-p4 will refuse to unshelve;
-you need to be unshelving onto an equivalent tree.
+A parent commit is created based on the origin, and then the unshelve commit is
+created based on that.
 
 The origin revision can be changed with the "--origin" option.