pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/advice.h b/advice.h
index acd5fdde3fbb04acaeec19b5ab1bd463c54eb8b6..9b7a3ad1ca126cb882e87d400820043043061f78 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -7,6 +7,7 @@ extern int advice_push_nonfastforward;
 extern int advice_status_hints;
 extern int advice_commit_before_merge;
 extern int advice_resolve_conflict;
+extern int advice_implicit_identity;
 
 int git_default_advice_config(const char *var, const char *value);