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 /environment.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 'environment.c')
| -rw-r--r-- | environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index c93b8f44df..d7e6c65763 100644 --- a/environment.c +++ b/environment.c @@ -52,7 +52,7 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; enum branch_track git_branch_track = BRANCH_TRACK_REMOTE; enum rebase_setup_type autorebase = AUTOREBASE_NEVER; -enum push_default_type push_default = PUSH_DEFAULT_MATCHING; +enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED; #ifndef OBJECT_CREATION_MODE #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS #endif |