diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2015-08-12 02:07:01 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2015-08-12 02:10:02 -0400 |
| commit | 8d0813e9f634496e1d4b8b4024888d6a6a1b9754 (patch) | |
| tree | 8a1418ad1a37813af74871f82044fd92b3d2564f /Documentation | |
| parent | 1e6072ff00093089c0ad86ea6000b8b138c7a591 (diff) | |
magit.org: edit rebase sequence log section
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/magit.org | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/magit.org b/Documentation/magit.org index 515f6f9..bc1e37f 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -2971,7 +2971,7 @@ requested that rebase stops at that commit, then point is placed on the commit that separates the two groups, i.e. on ~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 @@ -3017,12 +3017,12 @@ The following words are used: - When a commit is prefixed with ~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 - ~HEAD~ and it also isn't one of the commits that will be applied when + ~HEAD~, and it also isn't one of the commits that will be applied when resuming the session. - When a commit is prefixed with ~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 @@ -3035,10 +3035,10 @@ The following words are used: 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. - When a commit is prefixed with ~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 @@ -3059,12 +3059,12 @@ The following words are used: - When a commit is prefixed with ~poof~ or ~gone~, then that indicates that you reset to an earlier commit (and that this commit therefore - is no longer reachable from ~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 ~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. - When a commit is prefixed with ~poof~, then that indicates that it - is no longer reachable from ~HEAD~ but that it has been replaced + is no longer reachable from ~HEAD~, but that it has been replaced with one or more commits, which together have the exact same effect. @@ -3077,7 +3077,7 @@ The following words are used: 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 |
