@@ -7,21 +7,22 @@ Updates since v1.7.0
7
7
* Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/.
8
8
9
9
* Some commands (e.g. svn and http interfaces) that interactively ask
10
- password can be told to use an external program given via GIT_ASKPASS.
10
+ for a password can be told to use an external program given via
11
+ GIT_ASKPASS.
11
12
12
13
* Conflict markers that lead the common ancestor in diff3-style output
13
- now has a label, which hopefully would help third-party tools that
14
+ now have a label, which hopefully would help third-party tools that
14
15
expect one.
15
16
16
17
* Comes with an updated bash-completion script.
17
18
18
19
* "git am" learned "--keep-cr" option to handle inputs that are
19
- mixture of changes to files with and without CRLF line endings.
20
+ a mixture of changes to files with and without CRLF line endings.
20
21
21
22
* "git cvsimport" learned -R option to leave revision mapping between
22
23
CVS revisions and resulting git commits.
23
24
24
- * "git diff --submodule" notices and descries dirty submodules.
25
+ * "git diff --submodule" notices and describes dirty submodules.
25
26
26
27
* "git for-each-ref" learned %(symref), %(symref:short) and %(flag)
27
28
tokens.
@@ -42,12 +43,11 @@ Updates since v1.7.0
42
43
* "git log -p --first-parent -m" shows one-parent diff for merge
43
44
commits, instead of showing combined diff.
44
45
45
- * "git merge-file" learned to use custom conflict marker size and also use
46
- the "union merge" behaviour.
46
+ * "git merge-file" learned to use custom conflict marker size and also
47
+ to use the "union merge" behaviour.
47
48
48
- * "git notes" command has been rewritten in C and learned quite a
49
- many commands and features to help you carry notes forward across
50
- rebases and amends.
49
+ * "git notes" command has been rewritten in C and learned many commands
50
+ and features to help you carry notes forward across rebases and amends.
51
51
52
52
* "git request-pull" identifies the commit the request is relative to in
53
53
a more readable way.
@@ -56,7 +56,7 @@ Updates since v1.7.0
56
56
near the tip while preserving your local changes in a way similar
57
57
to how "git checkout branch" does.
58
58
59
- * "git status" notices and descries dirty submodules.
59
+ * "git status" notices and describes dirty submodules.
60
60
61
61
* "git svn" should work better when interacting with repositories
62
62
with CRLF line endings.
0 commit comments