@@ -32,12 +32,12 @@ Compatibility Notes
3232 * When you do not tell which branches and tags to push to the "git push"
3333 command in any way, the command used "matching refs" rule to update
3434 remote branches and tags with branches and tags with the same name you
35- locally have. In future versions of Git, this will change to use the
36- "upstream" rule to update the branch at the remote you would "pull"
37- from into your current branch with your local current branch. The
38- release after 1.7.10 will start issuing a warning about this change,
39- to encourage you to tell the command what to push out, e.g. by setting
40- push. default configuration .
35+ locally have. In future versions of Git, this will change to push out
36+ only your current branch according to either the "upstream" or the
37+ "current" rule. Although "upstream" may be more powerful once the
38+ user understands Git better, the semantics "current" gives is
39+ simpler and easier to understand for beginners and may be a safer
40+ and better default option, but we haven't decided yet .
4141
4242
4343Updates since v1.7.9
@@ -58,7 +58,7 @@ UI, Workflows & Features
5858 * Teams for localizing the messages from the Porcelain layer of
5959 commands are starting to form, thanks to Jiang Xin who volunteered
6060 to be the localization coordinator. Translated messages for
61- simplified Chinese and Swedish are available.
61+ simplified Chinese, Swedish and Portuguese are available.
6262
6363 * The configuration mechanism learned an "include" facility; an
6464 assignment to the include.path pseudo-variable causes the named
0 commit comments