mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 19:14:02 +01:00
Code

Sync with 1.7.4.3

Browse Source
This commit is contained in:
Junio C Hamano 2011-04-03 00:14:16 -07:00
commit 8f84c95fb2
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Documentation/RelNotes/1.7.4.3.txt Normal file
View File

@ -0,0 +1,32 @@
Git v1.7.4.3 Release Notes
==========================
Fixes since v1.7.4.2
--------------------
* "git apply" used to confuse lines updated by previous hunks as lines
that existed before when applying a hunk, contributing misapplication
of patches with offsets.
* "git branch --track" (and "git checkout --track --branch") used to
allow setting up a random non-branch that does not make sense to follow
as the "upstream". The command correctly diagnoses it as an error.
* "git checkout $other_branch" silently removed untracked symbolic links
in the working tree that are in the way in order to check out paths
under it from the named branch.
* "git cvsimport" did not bail out immediately when the cvs server cannot
be reached, spewing unnecessary error messages that complain about the
server response that it never got.
* "git diff --quiet" did not work very well with the "--diff-filter"
option.
* "git grep -n" lacked a long-hand synonym --line-number.
* "git stash apply" reported the result of its operation by running
"git status" from the top-level of the working tree; it should (and
now does) run it from the user's working directory.
And other minor fixes and documentation updates.

7
Documentation/git-pack-objects.txt
View File

@ -192,13 +192,18 @@ self-contained. Use `git index-pack --fix-thin`
--delta-base-offset::
A packed archive can express the base object of a delta as
either a 20-byte object name or as an offset in the
stream, but older versions of git don't understand the
stream, but ancient versions of git don't understand the
latter. By default, 'git pack-objects' only uses the
former format for better compatibility. This option
allows the command to use the latter format for
compactness. Depending on the average delta chain
length, this option typically shrinks the resulting
packfile by 3-5 per-cent.
+
Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]),
`git repack` (see linkgit:git-repack[1]) pass this option by default
in modern git when they put objects in your repository into pack files.
So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
--threads=<n>::
Specifies the number of threads to spawn when searching for best