Git 1.8.0-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 1, 2012 at 13:09 UTC
b0ec16b49eb283156e13bbef26466d948e4fd992
2 files changed
+24
-1
Documentation/RelNotes/1.8.0.txt
+23
@@ -65,6 +65,10 @@ UI, Workflows & Features
65
* "git merge-base" learned "--is-ancestor A B" option to tell if A is
66
an ancestor of B. The result is indicated by its exit status code.
67
68
+ * "git mergetool" allows users to override the actual command used
69
+ with the mergetool.$name.cmd configuration variable even for built-in
70
+ mergetool backends.
71
+
72
* The "-Xours" backend option to "git merge -s recursive" now takes
73
effect even on binary files.
74
@@ -154,6 +158,10 @@ to them for details).
158
more useful by showing cleanly merged parts as coming from the other
159
branch that is being merged.
160
161
+ * It was unclear in the documentation for "git blame" that it is
162
+ unnecessary for users to use the "--follow" option.
163
+ (merge e5dce96 jc/blame-follows-renames later to maint).
164
+
165
* Output from "git branch -v" contains "(no branch)" that could be
166
localized, but the code to align it along with the names of
167
branches were counting in bytes, not in display columns.
@@ -163,6 +171,12 @@ to them for details).
171
order, which is not what the user who said "A C B" naturally
172
expects.
173
174
+ * A repository created with "git clone --single" had its fetch
175
+ refspecs set up just like a clone without "--single", leading the
176
+ subsequent "git fetch" to slurp all the other branches, defeating
177
+ the whole point of specifying "only this branch".
178
+ (merge 31b808a rt/maint-clone-single later to maint).
179
+
180
* Documentation talked about "first line of commit log" when it meant
181
the title of the commit. The description was clarified by defining
182
how the title is decided and rewording the casual mention of "first
@@ -204,6 +218,11 @@ to them for details).
218
* "git p4", when "--use-client-spec" and "--detect-branches" are used
219
together, misdetected branches.
220
221
+ * "git receive-pack" (the counterpart to "git push") did not give
222
+ progress output while processing objects it received to the puser
223
+ when run over the smart-http protocol.
224
+ (merge 74eb32d jk/receive-pack-unpack-error-to-pusher later to maint).
225
+
226
* When you misspell the command name you give to the "exec" action in
227
the "git rebase -i" insn sheet, you are told that 'rebase' is not a
228
git subcommand from "git rebase --continue".
@@ -228,3 +247,7 @@ to them for details).
247
subcommand to "git submodule"; the user instead got a complaint
248
that "git submodule status" was run with an unknown path "frotz".
249
(merge af9c9f9 rr/maint-submodule-unknown-cmd later to maint).
250
+
251
+ * "git status" honored the ignore=dirty settings in .gitmodules but
252
+ "git commit" didn't.
253
+ (merge 8f6811e os/commit-submodule-ignore later to maint).
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.12.GIT
4
+DEF_VER=v1.8.0-rc0
5
6
LF='
7
'