Git 1.7.5-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt
index 9c72084ff928e76b7cd8ef8823bbff6e80ab8a18..b1b25133eb48cda8546eb4bd17d43af6a5fcec93 100644 (file)
--- a/Documentation/RelNotes/1.7.5.txt
+++ b/Documentation/RelNotes/1.7.5.txt
@@ -54,6 +54,8 @@ Updates since v1.7.4
    negotiation is done. This saves one HTTP RPC, reducing the overall
    latency for a trivial fetch.
 
    negotiation is done. This saves one HTTP RPC, reducing the overall
    latency for a trivial fetch.
 

+ * "git fetch" can be told to recursively fetch submodules on-demand.
+

  * "git grep -f <filename>" learned to treat "-" as "read from the
    standard input stream".
 
  * "git grep -f <filename>" learned to treat "-" as "read from the
    standard input stream".
 


@@ -92,16 +94,16 @@ Updates since v1.7.4
    "tracking" is used as the push.default semantics or there is no remote
    configured yet.
 
    "tracking" is used as the push.default semantics or there is no remote
    configured yet.
 

+ * A possible value to the "push.default" configuration variable,
+   'tracking', gained a synonym that more naturally describes what it
+   does, 'upstream'.
+

  * "git rerere" learned a new subcommand "remaining" that is similar to
    "status" and lists the paths that had conflicts which 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.
 
  * "git rerere" learned a new subcommand "remaining" that is similar to
    "status" and lists the paths that had conflicts which 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.
 
 
 Also contains various documentation updates.
 
 


@@ -124,13 +126,13 @@ release, unless otherwise noted.
    reachable from the refs in their common alternate object store,
    causing it to fetch unnecessary objects (jc/maint-fetch-alt).
 
    reachable from the refs in their common alternate object store,
    causing it to fetch unnecessary objects (jc/maint-fetch-alt).
 

- * "git pull" into an empty branch should have behaved as if
-   fast-forwarding from emptiness to the version being pulled, with
-   the usual protection against overwriting untracked files (need to
-   cherry-pick 4b3ffe5).
+ * "git remote add --mirror" created a configuration that is suitable for
+   doing both a mirror fetch and a mirror push at the same time, which
+   made little sense.  We now warn and require the command line to specify
+   either --mirror=fetch or --mirror=push.

 
 ---
 exec >/var/tmp/1
 
 ---
 exec >/var/tmp/1

-O=v1.7.5-rc0-99-g8f84c95
+O=v1.7.5-rc1

 echo O=$(git describe 'master')
 git shortlog --no-merges ^maint ^$O master
 echo O=$(git describe 'master')
 git shortlog --no-merges ^maint ^$O master

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 78499db81bd130fcf64a5a5e7adf85e1b522d230..7df49ea0d288f65737568b2746c4e404e55cd06d 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.7.4.3/git.html[documentation for release 1.7.4.3]
+* link:v1.7.4.4/git.html[documentation for release 1.7.4.4]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.7.4.4.txt[1.7.4.4],

   link:RelNotes/1.7.4.3.txt[1.7.4.3],
   link:RelNotes/1.7.4.2.txt[1.7.4.2],
   link:RelNotes/1.7.4.1.txt[1.7.4.1],
   link:RelNotes/1.7.4.3.txt[1.7.4.3],
   link:RelNotes/1.7.4.2.txt[1.7.4.2],
   link:RelNotes/1.7.4.1.txt[1.7.4.1],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 35848df0346aef1c2f91fb81cecd8751590db196..e9b2a47aff562c5ced271324a9bebb26a2f64bc2 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.5-rc0
+DEF_VER=v1.7.5-rc1

 
 LF='
 '
 
 LF='
 '