Update release notes to 1.7.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 16, 2011 at 16:58 UTC
b602ed7dea968d72c5b3f61ca016de7f285d80ef
1 file changed
+20
-13
Documentation/RelNotes/1.7.6.txt
+20
-13
@@ -18,6 +18,12 @@ Updates since v1.7.5
18
* "git blame" learned "--abbrev[=<n>]" option to control the minimum
19
number of hexdigits shown for commit object names.
20
21
+ * Aborting "git commit --interactive" discards updates to the index
22
+ made during the interctive session.
23
+
24
+ * "git commit" learned a "--patch" option to directly jump to the
25
+ per-hunk selection UI of the interactive mode.
26
+
27
* "git diff -C -C" used to disable the rename detection entirely when
28
there are too many copy candidate paths in the tree; now it falls
29
back to "-C" when doing so would keep the copy candidate paths
@@ -44,6 +50,12 @@ Updates since v1.7.5
50
* "git merge" learned "-" as a short-hand for "the previous branch", just
51
like the way "git checkout -" works.
52
53
+ * "git merge" uses "merge.ff" configuration variable to decide to always
54
+ create a merge commit (i.e. --no-ff, aka merge.ff=no), refuse to create
55
+ a merge commit (i.e. --ff-only, aka merge.ff=only). Setting merge.ff=yes
56
+ (or not setting it at all) restores the default behaviour of allowing
57
+ fast-forward to happen when possible.
58
+
59
* "git rebase" that does not specify on top of which branch to rebase
60
the current branch now uses @{upstream} of the current branch.
61
@@ -67,23 +79,18 @@ Fixes since v1.7.5
79
Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
80
included in this release.
81
70
- * "git add -p" did not work correctly when a hunk is split and then
71
- one of them was given to the editor.
72
- (merge jc/maint-add-p-overlapping-hunks later)
82
+ * Setting $(prefix) in config.mak did not affect where etc/gitconfig
83
+ file is read from, even though passing it from the command line of
84
+ $(MAKE) did.
85
+ (merge kk/maint-prefix-in-config-mak later)
86
74
- * "git add -u" did not resolve a conflict where our history deleted and
75
- their history modified the same file, and the working tree resolved to
76
- keep a file.
77
- (merge jc/fix-add-u-unmerged later)
87
+ * The bash completion scripts should correctly work using zsh's bash
88
+ completion emulation layer now.
89
+ (merge either fc/completion-zsh later)
90
91
* "git config" used to choke with an insanely long line.
92
(merge ef/maint-strbuf-init later)
93
82
- * In "git merge", per-branch branch.<name>.mergeoptions configuration
83
- variables did not override the fallback default merge.<option>
84
- configuration variables such as merge.ff, merge.log, etc.
85
- (merge jc/maint-branch-mergeoptions later)
86
-
94
* "git send-pack" (hence "git push") over smalt-HTTP protocol could
95
deadlock when the client side pack-object died early.
96
(merge js/maint-send-pack-stateless-rpc-deadlock-fix later)
@@ -91,5 +98,5 @@ included in this release.
98
---
99
exec >/var/tmp/1
100
echo O=$(git describe master)
94
-O=v1.7.5.1-288-ge4ae6ef
101
+O=v1.7.5.1-339-g254fd97
102
git shortlog --no-merges ^maint ^$O master