First half of the fifth batch for 1.8.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 10, 2012 at 15:52 UTC
682ce8bb37414afe87515123fc6c26f21dd35b15
1 file changed
+24
Documentation/RelNotes/1.8.0.txt
+24
@@ -15,6 +15,10 @@ preference configuration variable "push.default" to change this, and
15
"git push" will warn about the upcoming change until you set this
16
variable.
17
18
+"git branch --set-upstream" is deprecated and may be removed in a
19
+relatively distant future. "git branch [-u|--set-upstream-to]" has
20
+been introduced with a saner order of arguments.
21
+
22
23
Updates since v1.7.12
24
---------------------
@@ -24,6 +28,16 @@ UI, Workflows & Features
28
* A credential helper for Win32 to allow access to the keychain of
29
the logged-in user has been added.
30
31
+ * A credential helper to allow access to the Gnome keyring has been
32
+ added.
33
+
34
+ * It was tempting to say "git branch --set-upstream origin/master",
35
+ but that tells Git to arrange the local branch "origin/master" to
36
+ integrate with the currently checked out branch, which is highly
37
+ unlikely what the user meant. The option is deprecated; use the
38
+ new "--set-upstream-to" (with a short-and-sweet "-u") option
39
+ instead.
40
+
41
* "git cherry-pick" learned the "--allow-empty-message" option to
42
allow it to replay a commit without any log message.
43
@@ -74,6 +88,16 @@ Unless otherwise noted, all the fixes since v1.7.12 in the
88
maintenance track are contained in this release (see release notes
89
to them for details).
90
91
+ * "git cherry-pick A C B" used to replay changes in A and then B and
92
+ then C if these three commits had committer timestamps in that
93
+ order, which is not what the user who said "A C B" naturally
94
+ expects.
95
+ (merge a73e22e mz/cherry-pick-cmdline-order later to maint).
96
+
97
+ * "git show --quiet" ought to be a synonym for "git show -s", but
98
+ wasn't.
99
+ (merge f9c75d8 jk/maint-quiet-is-synonym-to-s-in-log later to maint).
100
+
101
* "git p4", when "--use-client-spec" and "--detect-branches" are used
102
together, misdetected branches.
103
(merge 21ef5df pw/p4-use-client-spec-branch-detection later to maint).