projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jk/rebase-i-comment-char'
[git.git]
/
advice.h
diff --git
a/advice.h
b/advice.h
index 8bf63563a5cf1573e0e6bf7ffcd5c55643d3f439..fad36df467f065bf7ff7a82d9d447ee4ac5cecb9 100644
(file)
--- a/
advice.h
+++ b/
advice.h
@@
-8,6
+8,8
@@
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
extern int advice_push_already_exists;
extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
extern int advice_push_already_exists;
+extern int advice_push_fetch_first;
+extern int advice_push_needs_force;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;