diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-11 14:36:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-11 14:36:00 -0700 |
| commit | 1d669b8c855625ae8c7f1fc1591e0fe86595e8b8 (patch) | |
| tree | 9381d957b186042e6eb21530bfd2c06383e37bcb /config.txt | |
| parent | 08ef8c2d17f14b195a0e55855550b7d205da01b2 (diff) | |
| download | git-htmldocs-1d669b8c855625ae8c7f1fc1591e0fe86595e8b8.tar.gz | |
Autogenerated HTML docs for v1.9.0-167-g38436
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/config.txt b/config.txt index 02776e51c..73904bce5 100644 --- a/config.txt +++ b/config.txt @@ -142,19 +142,13 @@ advice.*:: -- pushUpdateRejected:: Set this variable to 'false' if you want to disable - 'pushNonFFCurrent', 'pushNonFFDefault', + 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists', 'pushFetchFirst', and 'pushNeedsForce' simultaneously. pushNonFFCurrent:: Advice shown when linkgit:git-push[1] fails due to a non-fast-forward update to the current branch. - pushNonFFDefault:: - Advice to set 'push.default' to 'upstream' or 'current' - when you ran linkgit:git-push[1] and pushed 'matching - refs' by default (i.e. you did not provide an explicit - refspec, and no 'push.default' configuration was set) - and it resulted in a non-fast-forward error. pushNonFFMatching:: Advice shown when you ran linkgit:git-push[1] and pushed 'matching refs' explicitly (i.e. you used ':', or @@ -1980,7 +1974,7 @@ When pushing to a remote that is different from the remote you normally pull from, work as `current`. This is the safest option and is suited for beginners. + -This mode will become the default in Git 2.0. +This mode has become the default in Git 2.0. * `matching` - push all branches having the same name on both ends. This makes the repository you are pushing to remember the set of @@ -1999,8 +1993,8 @@ suitable for pushing into a shared central repository, as other people may add new branches there, or update the tip of existing branches outside your control. + -This is currently the default, but Git 2.0 will change the default -to `simple`. +This used to be the default, but not since Git 2.0 (`simple` is the +new default). -- |