Add push --set-upstream

diff --git a/cache.h b/cache.h
index 46606477b626c9bdb6a60f9c0cf826c8fc435e00..cf36c8160e8027aa608da4baf59e2d9f04f0ccdd 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -177,6 +177,7 @@ struct cache_entry {
 
 #define CE_HASHED    (0x100000)
 #define CE_UNHASHED  (0x200000)
+#define CE_CONFLICTED (0x800000)
 
 /* Only remove in work directory, not index */
 #define CE_WT_REMOVE (0x400000)
@@ -722,6 +723,7 @@ extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *
 extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
 extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
 extern int interpret_branch_name(const char *str, struct strbuf *);
+extern int get_sha1_mb(const char *str, unsigned char *sha1);
 
 extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules);
 extern const char *ref_rev_parse_rules[];