Skip to content

Commit e8dde3e

Browse files
committed
Git 1.7.10
Signed-off-by: Junio C Hamano <[email protected]>
1 parent e681a93 commit e8dde3e

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

Documentation/RelNotes/1.7.10.txt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Compatibility Notes
1919
GIT_MERGE_AUTOEDIT=no
2020
export GIT_MERGE_AUTOEDIT
2121

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
2323
merge commits, you do not have to do anything). Alternatively, you
2424
can give the "--no-edit" option to individual invocations of the
2525
"git merge" command if you know everybody who uses your script has
@@ -29,15 +29,16 @@ Compatibility Notes
2929
while and were deprecated in mid 2008 (v1.6.0). When you give these
3030
options to "git am", it will now warn and ask you not to use them.
3131

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.
4142

4243

4344
Updates since v1.7.9
@@ -139,6 +140,8 @@ UI, Workflows & Features
139140
* Project search in "gitweb" shows the substring that matched in the
140141
project name and description highlighted.
141142

143+
* HTTP transport learned to authenticate with a proxy if needed.
144+
142145
* A new script "diffall" is added to contrib/; it drives an
143146
external tool to perform a directory diff of two Git revisions
144147
in one go, unlike "difftool" that compares one file at a time.

Documentation/git.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ unreleased) version of git, that is available from 'master'
4444
branch of the `git.git` repository.
4545
Documentation for older releases are available here:
4646

47+
* link:v1.7.10/git.html[documentation for release 1.7.10]
48+
49+
* release notes for
50+
link:RelNotes/1.7.10.txt[1.7.10].
51+
4752
* link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
4853

4954
* release notes for

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v1.7.10-rc4
4+
DEF_VER=v1.7.10
55

66
LF='
77
'

0 commit comments

Comments
 (0)