Git 1.7.5-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 6, 2011 at 10:57 UTC
6be0559183ac0b40680df314748141d1bdf28e41
3 files changed
+14
-11
Documentation/RelNotes/1.7.5.txt
+11
-9
@@ -54,6 +54,8 @@ Updates since v1.7.4
54
negotiation is done. This saves one HTTP RPC, reducing the overall
55
latency for a trivial fetch.
56
57
+ * "git fetch" can be told to recursively fetch submodules on-demand.
58
+
59
* "git grep -f <filename>" learned to treat "-" as "read from the
60
standard input stream".
61
@@ -92,16 +94,16 @@ Updates since v1.7.4
94
"tracking" is used as the push.default semantics or there is no remote
95
configured yet.
96
97
+ * A possible value to the "push.default" configuration variable,
98
+ 'tracking', gained a synonym that more naturally describes what it
99
+ does, 'upstream'.
100
+
101
* "git rerere" learned a new subcommand "remaining" that is similar to
102
"status" and lists the paths that had conflicts which are known to
103
rerere, but excludes the paths that have already been marked as
104
resolved in the index from its output. "git mergetool" has been
105
updated to use this facility.
106
101
- * A possible value to the "push.default" configuration variable,
102
- 'tracking', gained a synonym that more naturally describes what it
103
- does, 'upstream'.
104
-
107
Also contains various documentation updates.
108
109
@@ -124,13 +126,13 @@ release, unless otherwise noted.
126
reachable from the refs in their common alternate object store,
127
causing it to fetch unnecessary objects (jc/maint-fetch-alt).
128
127
- * "git pull" into an empty branch should have behaved as if
128
- fast-forwarding from emptiness to the version being pulled, with
129
- the usual protection against overwriting untracked files (need to
130
- cherry-pick 4b3ffe5).
129
+ * "git remote add --mirror" created a configuration that is suitable for
130
+ doing both a mirror fetch and a mirror push at the same time, which
131
+ made little sense. We now warn and require the command line to specify
132
+ either --mirror=fetch or --mirror=push.
133
134
---
135
exec >/var/tmp/1
134
-O=v1.7.5-rc0-99-g8f84c95
136
+O=v1.7.5-rc1
137
echo O=$(git describe 'master')
138
git shortlog --no-merges ^maint ^$O master
Documentation/git.txt
+2
-1
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
44
branch of the `git.git` repository.
45
Documentation for older releases are available here:
46
47
-* link:v1.7.4.3/git.html[documentation for release 1.7.4.3]
47
+* link:v1.7.4.4/git.html[documentation for release 1.7.4.4]
48
49
* release notes for
50
+ link:RelNotes/1.7.4.4.txt[1.7.4.4],
51
link:RelNotes/1.7.4.3.txt[1.7.4.3],
52
link:RelNotes/1.7.4.2.txt[1.7.4.2],
53
link:RelNotes/1.7.4.1.txt[1.7.4.1],
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.5-rc0
4
+DEF_VER=v1.7.5-rc1
5
6
LF='
7
'