summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-06 17:57:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-06 17:57:32 (GMT)
commit6be0559183ac0b40680df314748141d1bdf28e41 (patch)
tree02b305e9c9203a2d664962c5c9c7d9c4aa626b09
parente38f2a88e56796d13c2a31192bc78ed930b89e54 (diff)
downloadgit-6be0559183ac0b40680df314748141d1bdf28e41.zip
git-6be0559183ac0b40680df314748141d1bdf28e41.tar.gz
git-6be0559183ac0b40680df314748141d1bdf28e41.tar.bz2
Git 1.7.5-rc1v1.7.5-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.5.txt20
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 14 insertions, 11 deletions
diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt
index 9c72084..b1b2513 100644
--- 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.
+ * "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".
@@ -92,16 +94,16 @@ Updates since v1.7.4
"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.
- * 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.
@@ -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).
- * "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
-O=v1.7.5-rc0-99-g8f84c95
+O=v1.7.5-rc1
echo O=$(git describe 'master')
git shortlog --no-merges ^maint ^$O master
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 78499db..7df49ea 100644
--- 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:
-* 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
+ 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],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 35848df..e9b2a47 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.5-rc0
+DEF_VER=v1.7.5-rc1
LF='
'