@@ -19,7 +19,7 @@ Compatibility Notes
19
19
GIT_MERGE_AUTOEDIT=no
20
20
export GIT_MERGE_AUTOEDIT
21
21
22
- to disable this behaviour (if you want your users to explain their
22
+ to disable this behavior (if you want your users to explain their
23
23
merge commits, you do not have to do anything). Alternatively, you
24
24
can give the "--no-edit" option to individual invocations of the
25
25
"git merge" command if you know everybody who uses your script has
@@ -29,15 +29,16 @@ Compatibility Notes
29
29
while and were deprecated in mid 2008 (v1.6.0). When you give these
30
30
options to "git am", it will now warn and ask you not to use them.
31
31
32
- * When you do not tell which branches and tags to push to the "git push"
33
- command in any way, the command used "matching refs" rule to update
34
- 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 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.
32
+ * When you do not tell which branches and tags to push to the "git
33
+ push" command in any way, the command used "matching refs" rule to
34
+ update remote branches and tags with branches and tags with the
35
+ same name you locally have. In future versions of Git, this will
36
+ change to push out only your current branch according to either the
37
+ "upstream" or the "current" rule. Although "upstream" may be more
38
+ powerful once the user understands Git better, the semantics
39
+ "current" gives is simpler and easier to understand for beginners
40
+ and may be a safer and better default option. We haven't decided
41
+ yet which one to switch to.
41
42
42
43
43
44
Updates since v1.7.9
@@ -139,6 +140,8 @@ UI, Workflows & Features
139
140
* Project search in "gitweb" shows the substring that matched in the
140
141
project name and description highlighted.
141
142
143
+ * HTTP transport learned to authenticate with a proxy if needed.
144
+
142
145
* A new script "diffall" is added to contrib/; it drives an
143
146
external tool to perform a directory diff of two Git revisions
144
147
in one go, unlike "difftool" that compares one file at a time.
0 commit comments