Update draft release notes to 1.7.0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 20, 2010 at 23:30 UTC
2eb41d7200d15f4b12ad6497a99786ec5357217d
1 file changed
+45
-1
Documentation/RelNotes-1.7.0.txt
+45
-1
@@ -77,9 +77,18 @@ Updates since v1.6.6
77
the submodule directory when it should (namely, when you are not
78
interested in the submodule at all and didn't clone/checkout).
79
80
+ * A new attribute conflict-marker-size can be used to change the size of
81
+ the conflict markers from the default 7; this is useful when tracked
82
+ contents (e.g. git-merge documentation) have strings that resemble the
83
+ conflict markers.
84
+
85
* "git checkout A...B" is a way to detach HEAD at the merge base between
86
A and B.
87
88
+ * "git checkout -m path" to reset the work tree file back into the
89
+ conflicted state works even when you already ran "git add path" and
90
+ resolved the conflicts.
91
+
92
* "git commit --date='<date>'" can be used to override the author date
93
just like "git commit --author='<name> <email>'" can be used to
94
override the author identity.
@@ -87,14 +96,49 @@ Updates since v1.6.6
96
* "git commit --no-status" can be used to omit the listing of the index
97
and the work tree status in the editor used to prepare the log message.
98
99
+ * "git commit" warns a bit more aggressively until you configure user.email,
100
+ whose default value almost always is not (and fundamentally cannot be)
101
+ what you want.
102
+
103
+ * "git difftool" has been extended to make it easier to integrate it
104
+ with gitk.
105
+
106
* "git fetch --all" can now be used in place of "git remote update".
107
108
+ * "git grep" does not rely on external grep anymore.
109
+
110
+ * "git grep" learned "--no-index" option, to search inside contents that
111
+ are not managed by git.
112
+
113
+ * "git merge" learned to pass options specific to strategy-backends. E.g.
114
+
115
+ - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree
116
+ strategy how much to shift the trees explicitly.
117
+
118
+ - "git merge -Xtheirs" can be used to auto-merge as much as possible,
119
+ while discarding your own changes and taking merged version in
120
+ conflicted regions.
121
+
122
* "git push" learned "git push origin --delete branch", a syntactic sugar
123
for "git push origin :branch".
124
125
+ * "git push" learned "git push --set-upstream origin forker:forkee" that
126
+ lets you configure your "forker" branch to later pull from "forkee"
127
+ branch at "origin".
128
+
129
* "git rebase --onto A...B" means the history is replayed on top of the
130
merge base between A and B.
131
132
+ * "git rebase -i" learned new action "fixup", that squashes the change
133
+ but does not affect existing log message.
134
+
135
+ * "git rebase -i" also learned --autosquash option, that is useful
136
+ together with the new "fixup" action.
137
+
138
+ * "git rerere" learned "forget path" subcommand. Together with "git
139
+ checkout -m path" it will be useful when you recorded a wrong
140
+ resolution.
141
+
142
* Use of "git reset --merge" has become easier when resetting away a
143
conflicted mess left in the work tree.
144
@@ -117,6 +161,6 @@ release, unless otherwise noted.
161
162
--
163
exec >/var/tmp/1
120
-O=v1.6.6-263-ge33fd3c
164
+O=v1.6.6.1-379-gd4556c4
165
echo O=$(git describe master)
166
git shortlog --no-merges $O..master ^maint