summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-28 20:28:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-28 20:28:20 (GMT)
commitafb0b7933f31e984caf6fb835f6afe6eb37d918c (patch)
treee369ed41fc97ea176b4b4b662ff3863606410709
parent8978166e531e0941811099d4117574ebbbcf35d8 (diff)
downloadgit-afb0b7933f31e984caf6fb835f6afe6eb37d918c.zip
git-afb0b7933f31e984caf6fb835f6afe6eb37d918c.tar.gz
git-afb0b7933f31e984caf6fb835f6afe6eb37d918c.tar.bz2
Start preparing release notes to 1.7.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.5.txt56
l---------RelNotes2
2 files changed, 57 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt
new file mode 100644
index 0000000..56c3863
--- /dev/null
+++ b/Documentation/RelNotes/1.7.5.txt
@@ -0,0 +1,56 @@
+Git v1.7.5 Release Notes (draft)
+========================
+
+Updates since v1.7.4
+--------------------
+
+ * Various MinGW portability fixes.
+
+ * Various git-p4 enhancements (in contrib).
+
+ * "git config" used to be also known as "git repo-config", but the old
+ name is now officially deprecated.
+
+ * "git checkout --detach <commit>" is a more user friendly synonym for
+ "git checkout <commit>^0".
+
+ * "git cherry-pick" and "git revert" can be told to use custom merge
+ strategy, similar to "git rebase".
+
+ * "rev-list --objects $revs -- $pathspec" would limit the objects listed
+ in its output properly with the pathspec, in preparation for narrow
+ clones.
+
+ * "git log" family of commands now understand globbing pathspecs. You
+ can say "git log -- '*.txt'" for example.
+
+ * "git rerere" learned a new subcommand "remaining", that is similar to
+ "status" that lists the paths that had conflicts that are known to
+ rerere, but excludes the paths that have already been marked as
+ resolved in the index from its output. "git mergetool" has been
+ updated to use this facility.
+
+ * A possible value to the "push.default" configuration variable,
+ 'tracking', gained a synonym that more naturally describes what it
+ does, 'upstream'.
+
+Also contains various documentation updates.
+
+
+Fixes since v1.7.4
+------------------
+
+All of the fixes in the v1.7.4.X maintenance series are included in this
+release, unless otherwise noted.
+
+ * "git merge" triggers prepare-commit-msg hook. Earlier, only "git
+ commit" to conclude an interrupted merge triggered the hook, leading to
+ an inconsistent overall user experience (js/maint-merge-use-prepare-commit-msg-hook).
+
+
+---
+exec >/var/tmp/1
+O=v1.7.4
+O=v1.7.4.1-140-g8978166
+echo O=$(git describe 'master')
+git shortlog --no-merges ^maint ^$O master
diff --git a/RelNotes b/RelNotes
index b942e49..540b756 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.4.txt \ No newline at end of file
+Documentation/RelNotes/1.7.5.txt \ No newline at end of file