mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git 1.7.5-rc1

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-04-06 10:57:32 -07:00
parent e38f2a88e5
commit 6be0559183
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Documentation/RelNotes/1.7.5.txt
View File

@ -54,6 +54,8 @@ Updates since v1.7.4
negotiation is done. This saves one HTTP RPC, reducing the overall negotiation is done. This saves one HTTP RPC, reducing the overall
latency for a trivial fetch. 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 * "git grep -f <filename>" learned to treat "-" as "read from the
standard input stream". 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 "tracking" is used as the push.default semantics or there is no remote
configured yet. 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 * "git rerere" learned a new subcommand "remaining" that is similar to
"status" and lists the paths that had conflicts which are known to "status" and lists the paths that had conflicts which are known to
rerere, but excludes the paths that have already been marked as rerere, but excludes the paths that have already been marked as
resolved in the index from its output. "git mergetool" has been resolved in the index from its output. "git mergetool" has been
updated to use this facility. 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, reachable from the refs in their common alternate object store,
causing it to fetch unnecessary objects (jc/maint-fetch-alt). causing it to fetch unnecessary objects (jc/maint-fetch-alt).
* "git pull" into an empty branch should have behaved as if * "git remote add --mirror" created a configuration that is suitable for
fast-forwarding from emptiness to the version being pulled, with doing both a mirror fetch and a mirror push at the same time, which
the usual protection against overwriting untracked files (need to made little sense. We now warn and require the command line to specify
cherry-pick 4b3ffe5). 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') echo O=$(git describe 'master')
git shortlog --no-merges ^maint ^$O master git shortlog --no-merges ^maint ^$O master

3
Documentation/git.txt
View File

@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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.3.txt[1.7.4.3],
link:RelNotes/1.7.4.2.txt[1.7.4.2], 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.1.txt[1.7.4.1],

2
GIT-VERSION-GEN
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.7.5-rc0 DEF_VER=v1.7.5-rc1
LF=' LF='
' '