Merge branch 'maint' into master

diff --git a/branch.h b/branch.h
index e125ff4ca89a87fadb03b3d8272b44ab33640c72..64173abf4db65b0a8e71c1c8880f97a3350306f7 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -14,7 +14,7 @@
  */
 void create_branch(const char *head, const char *name, const char *start_name,
                   int force, int reflog,
-                  int clobber_head, enum branch_track track);
+                  int clobber_head, int quiet, enum branch_track track);
 
 /*
  * Validates that the requested branch may be created, returning the
@@ -47,4 +47,9 @@ void remove_branch_state(void);
 #define BRANCH_CONFIG_VERBOSE 01
 extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);
 
+/*
+ * Read branch description
+ */
+extern int read_branch_desc(struct strbuf *, const char *branch_name);
+
 #endif