diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:18:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-11 11:18:43 -0700 |
| commit | 07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (patch) | |
| tree | be3f24134f5956774c7d5407231a31bab33d5616 /advice.c | |
| parent | Merge branch 'js/fast-import-test-9300' into maint (diff) | |
| parent | Fix httpd tests that broke when non-ff push advice changed (diff) | |
| download | git-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.tar.gz git-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.zip | |
Merge branch 'ct/advise-push-default' into maint
The cases "git push" fails due to non-ff can be broken into three
categories; each case is given a separate advise message.
By Christopher Tiwald (2) and Jeff King (1)
* ct/advise-push-default:
Fix httpd tests that broke when non-ff push advice changed
clean up struct ref's nonfastforward field
push: Provide situational hints for non-fast-forward errors
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,6 +1,9 @@ #include "cache.h" int advice_push_nonfastforward = 1; +int advice_push_non_ff_current = 1; +int advice_push_non_ff_default = 1; +int advice_push_non_ff_matching = 1; int advice_status_hints = 1; int advice_commit_before_merge = 1; int advice_resolve_conflict = 1; @@ -12,6 +15,9 @@ static struct { int *preference; } advice_config[] = { { "pushnonfastforward", &advice_push_nonfastforward }, + { "pushnonffcurrent", &advice_push_non_ff_current }, + { "pushnonffdefault", &advice_push_non_ff_default }, + { "pushnonffmatching", &advice_push_non_ff_matching }, { "statushints", &advice_status_hints }, { "commitbeforemerge", &advice_commit_before_merge }, { "resolveconflict", &advice_resolve_conflict }, |