Merge branch 'vv/merge-squash-with-explicit-commit' into maint

diff --git a/checkout.h b/checkout.h
index 6b2073310c4a6a735a557ab0883c7bb045c2c458..1152133bd77a773f40afd6c3477224e051318e0c 100644 (file)
--- a/checkout.h
+++ b/checkout.h
@@ -8,8 +8,8 @@
  * tracking branch.  Return the name of the remote if such a branch
  * exists, NULL otherwise.
  */
-extern const char *unique_tracking_name(const char *name,
-                                       struct object_id *oid,
-                                       int *dwim_remotes_matched);
+const char *unique_tracking_name(const char *name,
+                                struct object_id *oid,
+                                int *dwim_remotes_matched);
 
 #endif /* CHECKOUT_H */