diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 0290689c81..1d77cc174f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -536,6 +536,9 @@ public final class Constants { /** name of the file containing the IDs of the parents of a merge commit */ public static final String MERGE_HEAD = "MERGE_HEAD"; + /** name of the file containing the ID of a cherry pick commit in case of conflicts */ + public static final String CHERRY_PICK_HEAD = "CHERRY_PICK_HEAD"; + /** * name of the ref ORIG_HEAD used by certain commands to store the original * value of HEAD |