@@ -23,6 +23,9 @@ Updates since v1.7.1
23
23
patch in a patch series, it failed to apply later patches that depend
24
24
on the presense of such blank lines.
25
25
26
+ * The message from "git am -3" has been improved when conflict
27
+ resolution ended up making the patch a no-op.
28
+
26
29
* "git checkout --orphan newbranch" is similar to "-b newbranch" but
27
30
prepares to create a root commit that is not connected to any existing
28
31
commit.
@@ -47,27 +50,38 @@ Updates since v1.7.1
47
50
been enhanced for visibility modifiers (public, protected, etc.) to
48
51
better support PHP5.
49
52
53
+ * "diff.noprefix" configuration variable can be used to implicitly
54
+ ask for "diff --no-prefix" behaviour.
55
+
50
56
* "git for-each-ref" learned "%(objectname:short)" that gives the object
51
57
name abbreviated.
52
58
53
59
* Various options to "git grep" (e.g. --count, --name-only) work better
54
60
with binary files.
55
61
62
+ * "git help -w" learned "chrome" and "chromium" browsers.
63
+
56
64
* "git log --follow <path>" follows across copies (it used to only follow
57
65
renames). This may make the processing more expensive.
58
66
67
+ * "git ls-files ../out/side/cwd" works now.
68
+
59
69
* "git notes prune" learned "-n" (dry-run) and "-v" options, similar to
60
70
what "git prune" has.
61
71
62
72
* "git patch-id" can be fed a mbox without getting confused by the
63
73
signature line in the format-patch output.
64
74
75
+ * "git remote" learned "set-branches" subcommand.
76
+
65
77
* "git revert" learned --strategy option to specify the merge strategy.
66
78
67
79
* "git status [-s] --ignored" can be used to list ignored paths.
68
80
81
+ * "git status -s -b" shows the current branch in the output.
82
+
69
83
* Various "gitweb" enhancements and clean-ups, including syntax
70
- highlighting.
84
+ highlighting, "plackup" support for instaweb, etc .
71
85
72
86
73
87
Fixes since v1.7.1
@@ -78,6 +92,9 @@ release, unless otherwise noted.
78
92
79
93
* We didn't recognize timezone "Z" as a synonym for "UTC" (75b37e70).
80
94
95
+ * We didn't URL decode "file:///path/to/repo" correctly when path/to/repo
96
+ had percent-encoded characters (638794c, 9d2e942).
97
+
81
98
* "git checkout" and "git rebase" overwrote paths that are marked "assume
82
99
unchanged" (aecda37c).
83
100
@@ -93,15 +110,27 @@ release, unless otherwise noted.
93
110
minimize the output, but this often was spending too many extra cycles
94
111
for very little gain (582aa00).
95
112
113
+ * "git diff --graph" works better with "--color-words" and other options
114
+ (81fa024..4297c0a).
115
+
116
+ * "git diff" could show ambiguous abbreviation of blob object names on
117
+ its "index" line (3e5a188).
118
+
119
+ * "git merge --log" used to replace the custom message given by "-m" with
120
+ the shortlog, instead of appending to it (tc/merge-m-log).
121
+
96
122
* "git pull" accepted "--dry-run", gave it to underlying "git fetch" but
97
123
ignored the option itself, resulting in a bogus attempt to merge
98
124
unrelated commit (29609e68).
99
125
100
126
* "git reset --hard" started from a wrong directory and a working tree in
101
127
a nonstandard location is in use got confused (560fb6a1).
102
128
129
+ * "git show -C -C" and other corner cases lost diff metainfo output
130
+ in 1.7.0 (296c6bb).
131
+
103
132
--
104
133
exec >/var/tmp/1
105
- O=v1.7.1-336-g0925c02
106
- echo O=$(git describe master )
107
- git shortlog --no-merges master ^maint ^$O
134
+ O=v1.7.1-423-gae391ec
135
+ echo O=$(git describe HEAD )
136
+ git shortlog --no-merges HEAD ^maint ^$O
0 commit comments