development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 12:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse source 
* maint:
  Git 1.7.4.1
  clone: fixup recurse_submodules option
  svn-fe: warn about experimental status

Conflicts:
	contrib/examples/git-revert.sh
	contrib/svn-fe/svn-fe.txt
This commit is contained in:
Junio C Hamano 2011-02-11 16:01:47 -08:00
parent b308bf1863 9971d6d52c
commit 00e6ee7246
4 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Documentation/RelNotes/1.7.4.1.txt Normal file
View file

@ -0,0 +1,27 @@
Git v1.7.4.1 Release Notes
==========================
Fixes since v1.7.4
------------------
* On Windows platform, the codepath to spawn a new child process forgot
to first flush the output buffer.
* "git bundle" did not use OFS_DELTA encoding, making its output a few
per-cent larger than necessarily.
* The option to tell "git clone" to recurse into the submodules was
misspelled with an underscore "--recurse_submodules".
* "git diff --cached HEAD" before the first commit does what an end user
would expect (namely, show what would be committed without further "git
add").
* "git fast-import" didn't accept the command to ask for "notes" feature
to be present in its input stream, even though it was capable of the
feature.
* "git fsck" gave up scanning loose object files in directories with
garbage files.
And other minor fixes and documentation updates.

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.
Documentation for older releases are available here:
* link:v1.7.4/git.html[documentation for release 1.7.4]
* link:v1.7.4.1/git.html[documentation for release 1.7.4.1]
* release notes for
link:RelNotes/1.7.4.1.txt[1.7.4.1],
link:RelNotes/1.7.4.txt[1.7.4].
* link:v1.7.3.5/git.html[documentation for release 1.7.3.5]

2
builtin/clone.c
View file

@ -66,7 +66,7 @@ static struct option builtin_clone_options[] = {
"setup as shared repository"),
OPT_BOOLEAN(0, "recursive", &option_recursive,
"initialize submodules in the clone"),
OPT_BOOLEAN(0, "recurse_submodules", &option_recursive,
OPT_BOOLEAN(0, "recurse-submodules", &option_recursive,
"initialize submodules in the clone"),
OPT_STRING(0, "template", &option_template, "path",
"path the template repository"),

3
contrib/svn-fe/svn-fe.txt
View file

@ -18,6 +18,9 @@ Subversion repository mirrored on the local disk. Remote Subversion
repositories can be mirrored on local disk using the `svnsync`
command.
Note: this tool is very young. The details of its commandline
interface may change in backward incompatible ways.
INPUT FORMAT
------------
Subversion's repository dump format is documented in full in