summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-06 17:49:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-06 17:50:00 (GMT)
commit5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e (patch)
tree68ef8d3d081fcd82fbb770b9f7fb0a7811cb8527
parent0c41f33c19c2f40015e31211557e818b000f9a25 (diff)
downloadgit-1.7.4.4.zip
git-1.7.4.4.tar.gz
git-1.7.4.4.tar.bz2
Git 1.7.4.4v1.7.4.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.4.4.txt10
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 6 insertions, 8 deletions
diff --git a/Documentation/RelNotes/1.7.4.4.txt b/Documentation/RelNotes/1.7.4.4.txt
index e914904..ff06e04 100644
--- a/Documentation/RelNotes/1.7.4.4.txt
+++ b/Documentation/RelNotes/1.7.4.4.txt
@@ -24,14 +24,12 @@ Fixes since v1.7.4.3
fast-forwarding from emptiness to the version being pulled, with
the usual protection against overwriting untracked files.
+ * "git submodule" that is run while a merge in the superproject is in
+ conflicted state tried to process each conflicted submodule up to
+ three times.
+
* "git status" spent all the effort to notice racily-clean index entries
but didn't update the index file to help later operations go faster in
some cases.
And other minor fixes and documentation updates.
-
----
-exec >/var/tmp/1
-O=v1.7.4.3-22-g8c8674f
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index cbd6e34..8557ac0 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.4.3
+DEF_VER=v1.7.4.4
LF='
'
diff --git a/RelNotes b/RelNotes
index d5ad5e1..211e93c 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.4.4 \ No newline at end of file
+Documentation/RelNotes/1.7.4.4.txt \ No newline at end of file