summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-02-15 15:24:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-15 15:24:55 -0800
commita4ee44448fe98dcd8f1db9e43729ac67fc80e031 (patch)
tree34f4cce68fd066d044dcbca866a161fa5c98dc6b
parentThird batch for 2.17 (diff)
parentGit 2.16.2 (diff)
downloadtgif-a4ee44448fe98dcd8f1db9e43729ac67fc80e031.tar.xz
Sync with 2.16.2
* tag 'v2.16.2': Git 2.16.2
-rw-r--r--Documentation/RelNotes/2.16.2.txt30
1 files changed, 30 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.16.2.txt b/Documentation/RelNotes/2.16.2.txt
new file mode 100644
index 0000000000..a216466d3d
--- /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.