aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-07-30 23:01:45 -0400
committerKyle Meyer <kyle@kyleam.com>2015-07-30 23:01:45 -0400
commitab41d03c1b09d0362018f1711a868d667b8abda1 (patch)
tree9b0ea938910a455aa539479ad36d74d553ecb634 /Documentation
parentbfa34693b1bf0cb6e909edd3dfb3d10e03df8a23 (diff)
2.2.0.txt: revise
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/2.2.0.txt48
1 files changed, 26 insertions, 22 deletions
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index 2ad0521..080338e 100644
--- a/Documentation/RelNotes/2.2.0.txt
+++ b/Documentation/RelNotes/2.2.0.txt
@@ -31,10 +31,10 @@ THIS IS NOT COMPLETE.
`magit-ediff-show-commit', and `magit-ediff-show-working-tree' have
been added to the Ediff popup.
-* A new option, `magit-ediff-dwim-show-on-hunks', controls whether
- calling `magit-ediff-dwim' runs a show variant
- (`magit-ediff-show-unstaged' or `magit-ediff-show-staged') rather
- than `magit-ediff-stage' when point is on an uncommitted hunk.
+* New option `magit-ediff-dwim-show-on-hunks' controls whether calling
+ `magit-ediff-dwim' runs a show variant (`magit-ediff-show-unstaged'
+ or `magit-ediff-show-staged') rather than `magit-ediff-stage' when
+ point is on an uncommitted hunk.
* `magit-diff' and `magit-ediff-compare' no longer prompt the user for
confirmation when constructing a range from the last and first
@@ -63,14 +63,14 @@ THIS IS NOT COMPLETE.
* Log graphs are no longer shown in color by default, because turning
the control sequences into faces is very inefficient. To allow
- users to get back the colorful graphs, the `--color' switch was
+ users to get back the colorful graphs, the `--color' switch has been
added to the log popup.
* In the refs manager, `RET' on a local branch again "visits" that
- branch by checking it out (like in v1.4), with a prefix argument it
+ branch by checking it out (like in v1.4). With a prefix argument it
instead "visits" the branch by showing information about other refs
- relative to the visited one (like it was the case v2.1 even without
- a prefix argument).
+ relative to the visited one (like in v2.1 even without a prefix
+ argument).
When the new option `magit-visit-ref-create' is non-nil, then a
remote branch is "visited" by creating a new local branch that
@@ -81,11 +81,11 @@ THIS IS NOT COMPLETE.
work in more places and in some cases copy more useful information
than before.
-* The new option `magit-push-always-verify' was added because changes
+* New option `magit-push-always-verify' has been added because changes
in v2.1 caused many users to accidentally push to `master' instead
of a remote feature branch as intended. All users should set this
- option to `nil', but only after having read the documentation. The
- commands that respect this option, instruct users to consult its
+ option to nil, but only after having read the documentation. The
+ commands that respect this option instruct users to consult its
documentation.
* Moving through a log using `n' and `p' is now much faster because
@@ -97,14 +97,18 @@ THIS IS NOT COMPLETE.
option `magit-diff-auto-show-delay'.
* When creating a new branch, first reading the starting point and
- only then the name of the new branch, has advantages. But many
- users disagree, so the option `magit-branch-read-upstream-first'
- was added. It defaults to `t'.
+ only then the name of the new branch has advantages. But many users
+ disagree, so the option `magit-branch-read-upstream-first' has been
+ added. It defaults to t.
-* The new commands `magit-submodule-deinit', `magit-commit-augment',
- `magit-push-implicitly', and `magit-push-quickly' were added.
+* New command `magit-submodule-deinit'.
-* When reading user input many commands now offer a better default
+* New command `magit-commit-augment' allows the user to pick a commit
+ to squash into and edit the squash commit message.
+
+* New push commands `magit-push-implicitly' and `magit-push-quickly'.
+
+* When reading user input, many commands now offer a better default
choice and better completion candidates.
* All apply variants now use `--3way' when called with a prefix
@@ -116,14 +120,14 @@ THIS IS NOT COMPLETE.
* When a file has conflicts then the type of conflict is shown now.
-* The option `magit-log-show-refname-after-summary' was added.
+* New option `magit-log-show-refname-after-summary'.
-* The section inserter `magit-insert-user-header' was added.
+* New section inserter `magit-insert-user-header'.
-* The face `magit-section-secondary-heading' was added.
+* New face `magit-section-secondary-heading'.
-Also contains various documentation fixes, code clean-ups, bug fixes,
-and other small to medium improvements.
+This release also contains various documentation fixes, code
+clean-ups, bug fixes, and other small to medium improvements.
Authors
-------