Skip to content

Commit

Permalink
Git 1.7.5-rc1
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Apr 6, 2011
1 parent e38f2a8 commit 6be0559
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
20 changes: 11 additions & 9 deletions Documentation/RelNotes/1.7.5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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".

Expand Down Expand Up @@ -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.


Expand All @@ -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
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v1.7.5-rc0
DEF_VER=v1.7.5-rc1

LF='
'
Expand Down

0 comments on commit 6be0559

Please sign in to comment.