aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2015-08-12 19:29:10 +0200
committerJonas Bernoulli <jonas@bernoul.li>2015-08-12 19:29:10 +0200
commit3213833e7c865b87280736936472d5a6d4903ce0 (patch)
tree3a5fd14ada461de9974827e466ba43c5ca1c1798 /Documentation
parentd1e63f56ddc71d020e9d949272181cda911296f6 (diff)
magit.texi: regenerate
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/magit.texi18
1 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index b2202eb..7542f96 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -4191,7 +4191,7 @@ requested that rebase stops at that commit, then point is placed on
the commit that separates the two groups, i.e. on @code{HEAD}. The commits
above it have not been applied yet, while it and the commits below it
have already been applied. In between these two groups or applied and
-yet-to-be applied commits there sometimes is a commit which has been
+yet-to-be applied commits, there sometimes is a commit which has been
dropped.
Each commit is prefixed with a word and these words are additionally
@@ -4255,14 +4255,14 @@ though.
When a commit is prefixed with @code{void}, then that indicates that Magit
knows for sure that all the changes in that commit have been applied
using several new commits. This commit is no longer reachable from
-@code{HEAD} and it also isn't one of the commits that will be applied when
+@code{HEAD}, and it also isn't one of the commits that will be applied when
resuming the session.
@item
When a commit is prefixed with @code{join}, then that indicates that the
rebase sequence stopped at that commit due to a conflict - you now
-have to join (merge) the changes, with what has already been
+have to join (merge) the changes with what has already been
applied. In a sense this is the commit rebase stopped at, but while
its effect is already in the index and in the worktree (with
conflict markers), the commit itself has not actually been applied
@@ -4277,12 +4277,12 @@ therefore is no longer reachable from @code{HEAD}), but that it might still
be possible to create a new commit with the exact same tree or at
least the same patch-id, without manually editing any file. Or at
the very least that there are some uncommitted remaining, which
-might, or might, not originate from that commit.
+may or may not originate from that commit.
@itemize
@item
When a commit is prefixed with @code{goal}, then that indicates that it
-is still be possible to create a commit with the exact same tree
+is still possible to create a commit with the exact same tree
(the "goal") without manually editing a file, by simply committing
the index (or, provided nothing is already staged, by staging all
unstaged changes and then committing that). This is the case when
@@ -4310,14 +4310,14 @@ tree and some of them likely originate from that commit.
@item
When a commit is prefixed with @code{poof} or @code{gone}, then that indicates
that you reset to an earlier commit (and that this commit therefore
-is no longer reachable from @code{HEAD}), and that there are no uncommitted
-changes remaining which might or might not allow you to create a new
+is no longer reachable from @code{HEAD}), and that there are no
+uncommitted changes remaining which might allow you to create a new
commit with the same tree or at least the same patch-id.
@itemize
@item
When a commit is prefixed with @code{poof}, then that indicates that it
-is no longer reachable from @code{HEAD} but that it has been replaced
+is no longer reachable from @code{HEAD}, but that it has been replaced
with one or more commits, which together have the exact same
effect.
@@ -4334,7 +4334,7 @@ changes which makes it impossible to know for sure.
Do not worry if you do not fully understand the above. That's okay,
you will acquire a good enough understanding through practice.
-For other sequence operations such as cherry-picking a similar section
+For other sequence operations such as cherry-picking, a similar section
is displayed, but they lack some of the features described below, due
to limitations in the git commands used to implement them. Most
importantly these sequences only support "picking" a commit but not