diff options
| author | Chris Rorvick <chris@rorvick.com> | 2012-12-03 03:27:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-03 16:04:09 (GMT) |
| commit | b450568209c8ae270d26ee7fda2e4687ad8a5327 (patch) | |
| tree | 7141322da5346153ef97169966607c67ff078757 /advice.c | |
| parent | 1184564eac8ef6c82da068a31f60aee0d6870265 (diff) | |
| download | git-b450568209c8ae270d26ee7fda2e4687ad8a5327.zip git-b450568209c8ae270d26ee7fda2e4687ad8a5327.tar.gz git-b450568209c8ae270d26ee7fda2e4687ad8a5327.tar.bz2 | |
push: allow already-exists advice to be disabled
Add 'advice.pushAlreadyExists' option to disable the advice shown when
an update is rejected for a reference that is not allowed to update at
all (verses those that are allowed to fast-forward.)
Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4,6 +4,7 @@ int advice_push_update_rejected = 1; int advice_push_non_ff_current = 1; int advice_push_non_ff_default = 1; int advice_push_non_ff_matching = 1; +int advice_push_already_exists = 1; int advice_status_hints = 1; int advice_commit_before_merge = 1; int advice_resolve_conflict = 1; @@ -18,6 +19,7 @@ static struct { { "pushnonffcurrent", &advice_push_non_ff_current }, { "pushnonffdefault", &advice_push_non_ff_default }, { "pushnonffmatching", &advice_push_non_ff_matching }, + { "pushalreadyexists", &advice_push_already_exists }, { "statushints", &advice_status_hints }, { "commitbeforemerge", &advice_commit_before_merge }, { "resolveconflict", &advice_resolve_conflict }, |