@@ -9,18 +9,9 @@ Updates since v1.7.5
9
9
* Clean-up of the C part of i18n (but not l10n---please wait)
10
10
continues.
11
11
12
- * When an object "$tree:$path" does not exist, if $path does exist in the
13
- subtree of $tree that corresponds to the subdirectory the user is in,
14
- git now suggests using "$tree:./$path" in addition to the advice to use
15
- the full path from the root of the working tree.
16
-
17
12
* "git blame" learned "--abbrev[=<n>]" option to control the minimum
18
13
number of hexdigits shown for commit object names.
19
14
20
- * "git clean" used to fail on an empty directory that is not readable,
21
- even though rmdir(2) could remove such a directory. Now we attempt it
22
- as the last resort.
23
-
24
15
* "git diff -C -C" used to disable the rename detection entirely when
25
16
there are too many copy candidate paths in the tree; now it falls
26
17
back to "-C" when doing so would keep the copy candidate paths
@@ -36,19 +27,15 @@ Updates since v1.7.5
36
27
* "git merge" learned "-" as a short-hand for "the previous branch", just
37
28
like the way "git checkout -" works.
38
29
39
- * "git pack-object" now takes core.bigfilethreashold into account, just
40
- like fast-imoprt does.
41
-
42
- * "git reflog" allows options like "--format=.." to be given.
43
-
44
- * "git stash apply" can now apply to a working tree with changes as long
45
- as there is no overlapping change as the stash being applied.
30
+ * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked
31
+ commits separately, producing more a useful output.
46
32
47
33
* "git submodule update" learned "--force" option to get rid of local
48
34
changes in submodules and replace them with the up-to-date version.
49
35
50
- * "git stash apply @{99999}" now is diagnosed as an error, unless you
51
- really have that many stash entries.
36
+ * Compressed tarball gitweb generates is made without the timestamp of
37
+ the tarball generation; snapshot from the same tree should result in
38
+ a same tarball.
52
39
53
40
Also contains various documentation updates.
54
41
@@ -62,15 +49,6 @@ included in this release.
62
49
* "git config" used to choke with an insanely long line.
63
50
(merge ef/maint-strbuf-init later)
64
51
65
- * The "--dirstat" option of "diff" family of commands used to totally
66
- ignore a change that only rearranged lines within a file. Such a
67
- change now counts as at least a minimum but non zero change.
68
-
69
- * The "--dirstat" option of "diff" family of commands used to use the
70
- pathname in the original, instead of the pathname in the result,
71
- when renames are involved.
72
- (merge jh/dirstat for the above two later)
73
-
74
52
* "diff -M --cached" used to use unmerged path as a possible rename
75
53
source candidate, which made no sense.
76
54
(merge mz/maint-rename-unmerged later)
@@ -79,6 +57,14 @@ included in this release.
79
57
nonsense result that consists of alternating empty output.
80
58
(merge early part of cn/format-patch-quiet later)
81
59
60
+ * "git format-patch" did not quote RFC822 special characters in the
61
+ email address (e.g From: Junio C. Hamano <
[email protected] >, not
62
+ From: "Junio C. Hamano" <
[email protected] >).
63
+ (merge jk/format-patch-quote-special-in-from later)
64
+
65
+ * "git mergetool" did not handle conflicted submoudules gracefully.
66
+ (merge jm/mergetool-submodules later)
67
+
82
68
* "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
83
69
mean the same thing.
84
70
(merge dm/stash-k-i-p later)
0 commit comments