summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/1.7.9.txt6
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.9.txt b/Documentation/RelNotes/1.7.9.txt
index 79397eb..5eb88b8 100644
--- a/Documentation/RelNotes/1.7.9.txt
+++ b/Documentation/RelNotes/1.7.9.txt
@@ -28,6 +28,10 @@ Updates since v1.7.8
building more generic "sequencer" on top of the implementation that
drives them.
+ * "git rev-parse FETCH_HEAD" after "git fetch" without specifying
+ what to fetch from the command line will now show the commit that
+ would be merged if the command were "git pull".
+
* "git add" learned to stream large files directly into a packfile
instead of writing them into individual loose object files.
@@ -108,7 +112,7 @@ details).
--
exec >/var/tmp/1
-O=v1.7.8.2-301-g48de656
+O=v1.7.9-rc0-44-g478c446
echo O=$(git describe master)
git log --first-parent --oneline --reverse ^$O master
echo
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4e83354..15d06cf 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.9-rc0
+DEF_VER=v1.7.9-rc1
LF='
'