* Various git-svn updates.
- * When an object "$tree:$path" does not exist, if $path does exist in the
- subtree of $tree that corresponds to the subdirectory the user is in,
- git now suggests using "$tree:./$path" in addition to the advice to use
- the full path from the root of the working tree.
+ * 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 clean" used to fail on an empty directory that is not readable,
- even though rmdir(2) could remove such a directory. Now we attempt it
- as the last resort.
+ * "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
* "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.
+
* "git merge" learned "-" as a short-hand for "the previous branch", just
like the way "git checkout -" works.
- * "git pack-object" now takes core.bigfilethreashold into account, just
- like fast-imoprt does.
+ * "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.
- * "git reflog" allows options like "--format=.." to be given.
+ * "git submodule update" learned "--force" option to get rid of local
+ changes in submodules and replace them with the up-to-date version.
- * "git stash apply" can now apply to a working tree with changes as long
- as there is no overlapping change as the stash being applied.
+ * 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 stash apply @{99999}" now is diagnosed as an error, unless you
- really have that many stash entries.
+ * "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.
+Also contains various documentation updates and minor miscellaneous
+changes.
Fixes since v1.7.5
Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
included in this release.
- * The "--date=relative" output format used to say "X years, 12 months"
- when it should have said "X+1 years".
- (merge mg/x-years-12-months later)
-
* "git config" used to choke with an insanely long line.
(merge ef/maint-strbuf-init later)
- * The "--dirstat" option of "diff" family of commands used to totally
- ignore a change that only rearranged lines within a file. Such a
- change now counts as at least a minimum but non zero change.
+ * "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 "--dirstat" option of "diff" family of commands used to use the
- pathname in the original, instead of the pathname in the result,
- when renames are involved.
- (merge jh/dirstat for the above two 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)
---
exec >/var/tmp/1
echo O=$(git describe master)
-O=v1.7.5-140-g5ae6f5c
+O=v1.7.5.1-216-g3970fc5
git shortlog --no-merges ^maint ^$O master