Skip to content

Commit ffa9524

Browse files
committed
Git 2.16.2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent c93150c commit ffa9524

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

Documentation/RelNotes/2.16.2.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Git v2.16.2 Release Notes
2+
=========================
3+
4+
Fixes since v2.16.1
5+
-------------------
6+
7+
* An old regression in "git describe --all $annotated_tag^0" has been
8+
fixed.
9+
10+
* "git svn dcommit" did not take into account the fact that a
11+
svn+ssh:// URL with a username@ (typically used for pushing) refers
12+
to the same SVN repository without the username@ and failed when
13+
svn.pushmergeinfo option is set.
14+
15+
* "git merge -Xours/-Xtheirs" learned to use our/their version when
16+
resolving a conflicting updates to a symbolic link.
17+
18+
* "git clone $there $here" is allowed even when here directory exists
19+
as long as it is an empty directory, but the command incorrectly
20+
removed it upon a failure of the operation.
21+
22+
* "git stash -- <pathspec>" incorrectly blew away untracked files in
23+
the directory that matched the pathspec, which has been corrected.
24+
25+
* "git add -p" was taught to ignore local changes to submodules as
26+
they do not interfere with the partial addition of regular changes
27+
anyway.
28+
29+
30+
Also contains various documentation updates and code clean-ups.

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=v2.16.1
4+
DEF_VER=v2.16.2
55

66
LF='
77
'

RelNotes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Documentation/RelNotes/2.16.1.txt
1+
Documentation/RelNotes/2.16.2.txt

0 commit comments

Comments
 (0)