diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 15:54:37 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 15:54:37 +0800 |
commit | 69c835701b507e336fd5354f9f3b05e42d20c07d (patch) | |
tree | cc6b079231ddc1ab3e04654cbdf8937ef0d6632b /environment.c | |
parent | l10n: Add the German translation team and initialize de.po (diff) | |
parent | The sixth batch of topics graduated to 'master' (diff) | |
download | tgif-69c835701b507e336fd5354f9f3b05e42d20c07d.tar.xz |
Merge master branch for tracking l10n updates of next release
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
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 |