Git 1.7.4-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 13, 2011 at 11:42 UTC
adf872e7837cc92e390f00ee32f32c5639d3a444
2 files changed
+11
-3
Documentation/RelNotes/1.7.4.txt
+10
-2
@@ -66,7 +66,7 @@ Updates since v1.7.3
66
objects unnecessarily.
67
68
* "git diff" and "git grep" learned what functions and subroutines
69
- in Fortran look like.
69
+ in Fortran and Perl look like.
70
71
* "git fetch" learned the "--recurse-submodules" option.
72
@@ -91,6 +91,14 @@ Updates since v1.7.3
91
directory in one branch while a new file is created in place of that
92
directory in the other branch.
93
94
+ * "git merge" learned the "--abort" option, synonymous to
95
+ "git reset --merge" when a merge is in progress.
96
+
97
+ * "git notes" learned the "merge" subcommand to merge notes refs.
98
+ In addition to the default manual conflict resolution, there are
99
+ also several notes merge strategies for automatically resolving
100
+ notes merge conflicts.
101
+
102
* "git rebase --autosquash" can use SHA-1 object names to name the
103
commit which is to be fixed up (e.g. "fixup! e83c5163").
104
@@ -146,6 +154,6 @@ release, unless otherwise noted.
154
155
---
156
exec >/var/tmp/1
149
-O=v1.7.4-rc1
157
+O=v1.7.4-rc2
158
echo O=$(git describe master)
159
git shortlog --no-merges ^maint ^$O master
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.4-rc1
4
+DEF_VER=v1.7.4-rc2
5
6
LF='
7
'