diff options
Diffstat (limited to 'Documentation/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/1.7.5.2.txt | 57 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.6.txt | 74 |
2 files changed, 92 insertions, 39 deletions
diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt new file mode 100644 index 0000000000..951eb7cb08 --- /dev/null +++ b/Documentation/RelNotes/1.7.5.2.txt @@ -0,0 +1,57 @@ +Git v1.7.5.2 Release Notes +========================== + +The release notes to 1.7.5.1 forgot to mention: + + * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now + mean the same thing. + + * "git upload-pack" (hence "git push" over git native protocol) had a + subtle race condition that could lead to a deadlock. + +Fixes since v1.7.5.1 +-------------------- + + * "git add -p" did not work correctly when a hunk is split and then + one of them was given to the editor. + + * "git add -u" did not resolve a conflict where our history deleted and + their history modified the same file, and the working tree resolved to + keep a file. + + * "git cvsimport" did not know that CVSNT stores its password file in a + location different from the traditional CVS. + + * "git diff-files" did not show the mode information from the working + tree side of an unmerged path correctly. + + * "git diff -M --cached" used to use unmerged path as a possible rename + source candidate, which made no sense. + + * The option name parser in "git fast-import" used prefix matches for + some options where it shouldn't, and accepted non-existent options, + e.g. "--relative-marksmith" or "--forceps". + + * "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>). + + * "git format-patch" when run with "--quiet" option used to produce a + nonsense result that consists of alternating empty output. + + * In "git merge", per-branch branch.<name>.mergeoptions configuration + variables did not override the fallback default merge.<option> + configuration variables such as merge.ff, merge.log, etc. + + * "git merge-one-file" did not honor GIT_WORK_TREE settings when + handling a "both sides added, differently" conflict. + + * "git mergetool" did not handle conflicted submoudules gracefully. + + * "git-p4" (in contrib) used a wrong base image while merge a file that + was added on both branches differently. + + * "git rebase -i -p" failed to preserve the history when there is a + redundant merge created with the --no-ff option. + +And other minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.txt index 8554918cf4..a3624a6c57 100644 --- a/Documentation/RelNotes/1.7.6.txt +++ b/Documentation/RelNotes/1.7.6.txt @@ -6,6 +6,8 @@ Updates since v1.7.5 * Various git-svn updates. + * Updates the way content tags are handled in gitweb. + * Clean-up of the C part of i18n (but not l10n---please wait) continues. @@ -16,14 +18,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 +50,14 @@ 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. + + * "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. @@ -51,9 +69,6 @@ Updates since v1.7.5 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 +79,24 @@ 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) + * 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-files" did not show the mode information from the working - tree side of an unmerged path correctly. - (merge jc/fix-diff-files-unmerged later) + * The bash completion scripts should correctly work using zsh's bash + completion emulation layer now. + (merge either fc/completion-zsh 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) - - * "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) - - * "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 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) + * "git config" used to choke with an insanely long line. + (merge ef/maint-strbuf-init 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) --- 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 |