diff options
Diffstat (limited to 'Documentation/RelNotes/1.7.6.txt')
| -rw-r--r-- | Documentation/RelNotes/1.7.6.txt | 89 |
1 files changed, 53 insertions, 36 deletions
diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.txt index 8554918cf4..f5faf280c5 100644 --- a/Documentation/RelNotes/1.7.6.txt +++ b/Documentation/RelNotes/1.7.6.txt @@ -6,6 +6,11 @@ Updates since v1.7.5 * Various git-svn updates. + * Updates the way content tags are handled in gitweb. + + * Similar to branch names, tagnames that begin with "-" are now + disallowed. + * Clean-up of the C part of i18n (but not l10n---please wait) continues. @@ -16,14 +21,24 @@ Updates since v1.7.5 * "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. + * Aborting "git commit --interactive" discards updates to the index + made during the interctive session. + + * "git commit" learned a "--patch" option to directly jump to the + per-hunk selection UI of the interactive mode. * "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 under the rename detection limit. + * "git diff" and its family of commands learned --dirstat=0 to show + directories that contribute less than 0.1% of changes. + + * "git diff" and its family of commands learned --dirstat=lines mode to + assess damage to the directory based on number of lines in the patch + output, not based on the similarity numbers. + * "git format-patch" learned "--quiet" option to suppress the output of the names of generated files. @@ -38,8 +53,16 @@ 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 merge" uses "merge.ff" configuration variable to decide to always + create a merge commit (i.e. --no-ff, aka merge.ff=no), refuse to create + a merge commit (i.e. --ff-only, aka merge.ff=only). Setting merge.ff=yes + (or not setting it at all) restores the default behaviour of allowing + fast-forward to happen when possible. + + * p4-import (from contrib) learned a new option --preserve-user. + + * "git rebase" that does not specify on top of which branch to rebase + the current branch now uses @{upstream} of the current branch. * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked commits separately, producing more a useful output. @@ -47,13 +70,14 @@ Updates since v1.7.5 * "git submodule update" learned "--force" option to get rid of local changes in submodules and replace them with the up-to-date version. + * "git status" and friends ignore .gitmodules file while the file is + still in a conflicted state during a merge, to avoid using information + that is not final and possibly corrupt with conflict markers. + * Compressed tarball gitweb generates is made without the timestamp of the tarball generation; snapshot from the same tree should result in a same tarball. - * "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. @@ -64,43 +88,36 @@ Fixes since v1.7.5 Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are included in this release. - * "git config" used to choke with an insanely long line. - (merge ef/maint-strbuf-init later) - - * "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) + * Setting $(prefix) in config.mak did not affect where etc/gitconfig + file is read from, even though passing it from the command line of + $(MAKE) did. + (merge kk/maint-prefix-in-config-mak 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) + * The bash completion scripts should correctly work using zsh's bash + completion emulation layer now. + (merge fc/completion-zsh later) - * "git format-patch" when run with "--quiet" option used to produce a - nonsense result that consists of alternating empty output. - (merge early part of cn/format-patch-quiet later) + * The logic to handle "&" (expand to UNIX username) in GECOS field + miscounted the length of the name it formatted. + (merge rg/copy-gecos-username later) - * "git format-patch" did not quote RFC822 special characters in the - email address (e.g From: Junio C. Hamano <jch@example.com>, not - From: "Junio C. Hamano" <jch@example.com>). - (merge jk/format-patch-quote-special-in-from later) + * "git cherry-pick -s resolve" failed to cherry-pick a root commit. + (merge jk/cherry-pick-root-with-resolve later) - * "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 config" used to choke with an insanely long line. + (merge ef/maint-strbuf-init 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) + * "git log --stdin path" with an input that has additional pathspec + used to corrupt memory. + (merge jc/maint-pathspec-stdin-and-cmdline later) - * "git upload-pack" (hence "git push" over git native protocol) had a - subtle race condition that could lead to a deadlock. - (merge jk/maint-upload-pack-shallow later) + * "git send-pack" (hence "git push") over smalt-HTTP protocol could + deadlock when the client side pack-object died early. + (merge js/maint-send-pack-stateless-rpc-deadlock-fix later) + (merge jk/git-connection-deadlock-fix later) --- exec >/var/tmp/1 echo O=$(git describe master) -O=v1.7.5.1-216-g3970fc5 +O=v1.7.5.1-339-g254fd97 git shortlog --no-merges ^maint ^$O master |