@@ -25,38 +25,37 @@ fn make() -> clap::Command {
25
25
. about ( "Repair stack after branch is modified with git commands" )
26
26
. long_about (
27
27
"If a branch with a StGit stack is modified with certain git commands such \
28
- as commit, pull, merge, or rebase, the StGit stack metadata will become \
29
- inconsistent with the branch state. There are a few options for resolving \
30
- this kind of situation:\n \
28
+ as git- commit(1), git- pull(1), git- merge(1) , or git- rebase(1) , the StGit \
29
+ stack metadata will become inconsistent with the branch state. There are \
30
+ a few options for resolving this kind of situation:\n \
31
31
\n \
32
- 1. Use \" stg undo\" to undo the effect of the git commands. Or similarly \
33
- use \" stg reset\" to reset the stack/branch to any previous stack state.\n \
32
+ 1. Use ' stg undo' to undo the effect of the git commands. Or similarly \
33
+ use ' stg reset' to reset the stack/branch to any previous stack state.\n \
34
34
\n \
35
- 2. Use \" stg repair\" . This will repair the StGit stack metadata to \
35
+ 2. Use ` stg repair` . This will repair the StGit stack metadata to \
36
36
accommodate the modifications to the branch made by the git commands. \
37
37
Specifically, it will do the following:\n \
38
38
\n \
39
39
- If regular git commits were made on top of the stack of StGit patches \
40
- (i.e. by using plain \" git commit\" ), \" stg repair\" will convert those \
40
+ (i.e. by using plain ` git commit` ), ` stg repair` will convert those \
41
41
commits to StGit patches, preserving their content.\n \
42
42
\n \
43
43
- However, merge commits cannot become patches. So if a merge was \
44
- committed on top of the stack, \" stg repair\" will mark all patches below \
44
+ committed on top of the stack, ` stg repair` will mark all patches below \
45
45
the merge commit as unapplied, since they are no longer reachable. An \
46
- alternative when this is not the desired behavior is to use \" stg undo\" \
47
- to first get rid of the offending merge and then run \" stg repair\" \
48
- again.\n \
46
+ alternative when this is not the desired behavior is to use `stg undo` to \
47
+ first get rid of the offending merge and then run `stg repair` again.\n \
49
48
\n \
50
49
- The applied patches are supposed to be precisely those that are \
51
- reachable from the branch head. If, for example, \" git reset\" was used \
52
- to move the head, some applied patches may no longer be reachable and \
53
- some unapplied patches may have become reachable. In this case, \" stg \
54
- repair \" will correct the applied/unapplied state of such patches.\n \
50
+ reachable from the branch head. If, for example, git- reset(1) was used to \
51
+ move the head, some applied patches may no longer be reachable and some \
52
+ unapplied patches may have become reachable. In this case, ` stg repair` \
53
+ will correct the applied/unapplied state of such patches.\n \
55
54
\n \
56
- \" stg repair\" will repair these inconsistencies reliably, so there are \
57
- valid workflows where git commands are used followed by \" stg repair\" . \
58
- For example, new patches can be created by first making commits with a \
59
- graphical commit tool and then running \" stg repair\" to convert those \
55
+ ` stg repair` will repair these inconsistencies reliably, so there are \
56
+ valid workflows where git commands are used followed by ` stg repair`. For \
57
+ example, new patches can be created by first making commits with a \
58
+ graphical commit tool and then running ` stg repair` to convert those \
60
59
commits into patches.",
61
60
)
62
61
}
0 commit comments