aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-29 14:07:59 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-29 15:26:17 -0700
commit9855b08d35edf8a8a441f24ff7b00e220a29f261 (patch)
tree05447e7e2048a5c01848aa003d6cda67b02fc27c
parentb886656403ed26a9a78f73724c640a3149636ada (diff)
downloadgit-9855b08d35edf8a8a441f24ff7b00e220a29f261.tar.gz
git-9855b08d35edf8a8a441f24ff7b00e220a29f261.tar.xz
Start 1.7.4 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.4.txt54
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 56 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
new file mode 100644
index 000000000..05e8a43a3
--- /dev/null
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -0,0 +1,54 @@
+Git v1.7.4 Release Notes (draft)
+================================
+
+Updates since v1.7.3
+--------------------
+
+ * The option parsers of various commands that create new branch (or
+ rename existing ones to a new name) were too loose and users were
+ allowed to call a branch with a name that begins with a dash by
+ creative abuse of their command line options, which only lead to
+ burn themselves. The name of a branch cannot begin with a dash
+ now.
+
+ * System-wide fallback default attributes can be stored in
+ /etc/gitattributes; core.attributesfile configuration variable can
+ be used to customize the path to this file.
+
+ * "git diff" and "git grep" learned how functions and subroutines
+ in Fortran look like.
+
+ * "git log -G<pattern>" limits the output to commits whose change has
+ added or deleted lines that match the given pattern.
+
+ * "git read-tree" with no argument as a way to empty the index is
+ deprecated; we might want to remove it in the future. Users can
+ use the new --empty option to be more explicit instead.
+
+ * "git merge --log" used to limit the resulting merge log to 20
+ entries; this is now customizable by giving e.g. "--log=47".
+
+ * you can extend "git shell", which is often used on boxes that allow
+ git-only login over ssh as login shell, with custom set of
+ commands.
+
+Also contains various documentation updates.
+
+
+Fixes since v1.7.3
+------------------
+
+All of the fixes in v1.7.3.X maintenance series are included in this
+release, unless otherwise noted.
+
+ * "git log --author=me --author=her" did not find commits written by
+ me or by her; instead it looked for commits written by me and by
+ her, which is impossible.
+
+
+---
+exec >/var/tmp/1
+O=v1.7.3
+O=v1.7.3.1-42-g34289ec
+echo O=$(git describe master)
+git shortlog --no-merges ^maint ^$O master
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 75b8b3cc6..d441d88d6 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.3.1
+DEF_VER=v1.7.3.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
index 50b2d422d..b942e4994 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.3.1.txt \ No newline at end of file
+Documentation/RelNotes/1.7.4.txt \ No newline at end of file