|
|
|
@ -9,9 +9,16 @@ Updates since v1.7.5
@@ -9,9 +9,16 @@ Updates since v1.7.5
|
|
|
|
|
* Clean-up of the C part of i18n (but not l10n---please wait) |
|
|
|
|
continues. |
|
|
|
|
|
|
|
|
|
* Processes spawned by "[alias] <name> = !process" in the configuration |
|
|
|
|
can inspect GIT_PREFIX environment variable to learn where in the |
|
|
|
|
working tree the original command was invoked. |
|
|
|
|
|
|
|
|
|
* "git blame" learned "--abbrev[=<n>]" option to control the minimum |
|
|
|
|
number of hexdigits shown for commit object names. |
|
|
|
|
|
|
|
|
|
* "git cvsimport" learned that CVSNT stores its password file in a |
|
|
|
|
location different from the traditional CVS. |
|
|
|
|
|
|
|
|
|
* "git diff -C -C" used to disable the rename detection entirely when |
|
|
|
|
there are too many copy candidate paths in the tree; now it falls |
|
|
|
|
back to "-C" when doing so would keep the copy candidate paths |
|
|
|
@ -20,6 +27,10 @@ Updates since v1.7.5
@@ -20,6 +27,10 @@ Updates since v1.7.5
|
|
|
|
|
* "git format-patch" learned "--quiet" option to suppress the output of |
|
|
|
|
the names of generated files. |
|
|
|
|
|
|
|
|
|
* "git format-patch" quotes people's names when it has RFC822 special |
|
|
|
|
characters in it, e.g. "Junio C. Hamano" <jch@example.com>. Earlier |
|
|
|
|
it was up to the user to do this when using its output. |
|
|
|
|
|
|
|
|
|
* "git log" and friends learned a new "--notes" option to replace the |
|
|
|
|
"--show-notes" option. Unlike "--show-notes", "--notes=<ref>" does |
|
|
|
|
not imply showing the default notes. |
|
|
|
@ -27,6 +38,9 @@ Updates since v1.7.5
@@ -27,6 +38,9 @@ Updates since v1.7.5
|
|
|
|
|
* "git merge" learned "-" as a short-hand for "the previous branch", just |
|
|
|
|
like the way "git checkout -" works. |
|
|
|
|
|
|
|
|
|
* "git merge-one-file" learned to honor GIT_WORK_TREE settings when |
|
|
|
|
handling "both sides added, differently" conflict. |
|
|
|
|
|
|
|
|
|
* "git rev-list --count" used with "--cherry-mark" counts the cherry-picked |
|
|
|
|
commits separately, producing more a useful output. |
|
|
|
|
|
|
|
|
@ -37,7 +51,11 @@ Updates since v1.7.5
@@ -37,7 +51,11 @@ Updates since v1.7.5
|
|
|
|
|
the tarball generation; snapshot from the same tree should result in |
|
|
|
|
a same tarball. |
|
|
|
|
|
|
|
|
|
Also contains various documentation updates. |
|
|
|
|
* "git-p4" (in contrib) learned to merge a file that was added on both |
|
|
|
|
branches differently by using 2-way merge. |
|
|
|
|
|
|
|
|
|
Also contains various documentation updates and minor miscellaneous |
|
|
|
|
changes. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fixes since v1.7.5 |
|
|
|
@ -49,7 +67,11 @@ included in this release.
@@ -49,7 +67,11 @@ included in this release.
|
|
|
|
|
* "git config" used to choke with an insanely long line. |
|
|
|
|
(merge ef/maint-strbuf-init later) |
|
|
|
|
|
|
|
|
|
* "diff -M --cached" used to use unmerged path as a possible rename |
|
|
|
|
* "git diff-files" did not show the mode information from the working |
|
|
|
|
tree side of an unmerged path correctly. |
|
|
|
|
(merge jc/fix-diff-files-unmerged later) |
|
|
|
|
|
|
|
|
|
* "git diff -M --cached" used to use unmerged path as a possible rename |
|
|
|
|
source candidate, which made no sense. |
|
|
|
|
(merge mz/maint-rename-unmerged later) |
|
|
|
|
|
|
|
|
@ -65,6 +87,10 @@ included in this release.
@@ -65,6 +87,10 @@ included in this release.
|
|
|
|
|
* "git mergetool" did not handle conflicted submoudules gracefully. |
|
|
|
|
(merge jm/mergetool-submodules later) |
|
|
|
|
|
|
|
|
|
* "git rebase -i -p" failed to preserve the history when there is a |
|
|
|
|
redundant merge created with the --no-ff option. |
|
|
|
|
(merge aw/maint-rebase-i-p-no-ff later) |
|
|
|
|
|
|
|
|
|
* "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now |
|
|
|
|
mean the same thing. |
|
|
|
|
(merge dm/stash-k-i-p later) |
|
|
|
@ -76,5 +102,5 @@ included in this release.
@@ -76,5 +102,5 @@ included in this release.
|
|
|
|
|
--- |
|
|
|
|
exec >/var/tmp/1 |
|
|
|
|
echo O=$(git describe master) |
|
|
|
|
O=v1.7.5-184-g23f536c |
|
|
|
|
O=v1.7.5.1-216-g3970fc5 |
|
|
|
|
git shortlog --no-merges ^maint ^$O master |
|
|
|
|