summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-15 23:21:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-15 23:21:23 (GMT)
commitffa952497288d29d94b16675c6789ef83850def3 (patch)
tree3e5ecb837fd0f196f2790cdf6fb4a153b5a399b7
parentc93150cfb02257b38d0f8abcafc7de5908afbb3b (diff)
downloadgit-ffa952497288d29d94b16675c6789ef83850def3.zip
git-ffa952497288d29d94b16675c6789ef83850def3.tar.gz
git-ffa952497288d29d94b16675c6789ef83850def3.tar.bz2
Git 2.16.2v2.16.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.16.2.txt30
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 32 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.16.2.txt b/Documentation/RelNotes/2.16.2.txt
new file mode 100644
index 0000000..a216466
--- /dev/null
+++ b/Documentation/RelNotes/2.16.2.txt
@@ -0,0 +1,30 @@
+Git v2.16.2 Release Notes
+=========================
+
+Fixes since v2.16.1
+-------------------
+
+ * An old regression in "git describe --all $annotated_tag^0" has been
+ fixed.
+
+ * "git svn dcommit" did not take into account the fact that a
+ svn+ssh:// URL with a username@ (typically used for pushing) refers
+ to the same SVN repository without the username@ and failed when
+ svn.pushmergeinfo option is set.
+
+ * "git merge -Xours/-Xtheirs" learned to use our/their version when
+ resolving a conflicting updates to a symbolic link.
+
+ * "git clone $there $here" is allowed even when here directory exists
+ as long as it is an empty directory, but the command incorrectly
+ removed it upon a failure of the operation.
+
+ * "git stash -- <pathspec>" incorrectly blew away untracked files in
+ the directory that matched the pathspec, which has been corrected.
+
+ * "git add -p" was taught to ignore local changes to submodules as
+ they do not interfere with the partial addition of regular changes
+ anyway.
+
+
+Also contains various documentation updates and code clean-ups.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 470f7b7..19e45a7 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.16.1
+DEF_VER=v2.16.2
LF='
'
diff --git a/RelNotes b/RelNotes
index 0172894..35c3c32 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.16.1.txt \ No newline at end of file
+Documentation/RelNotes/2.16.2.txt \ No newline at end of file