diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
| commit | b76a68630eaab75c4eb1c41f0fc091811854ff43 (patch) | |
| tree | 5be60264e80970f60d9c56b410c8828693be8588 /git-rebase.txt | |
| parent | 0aadbc37c068365a09926cd895863c4a725b45d6 (diff) | |
| download | git-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz | |
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 841ebd6a9..147fa1a8e 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -271,7 +271,7 @@ which makes little sense. -X <strategy-option>:: --strategy-option=<strategy-option>:: Pass the <strategy-option> through to the merge strategy. - This implies `\--merge` and, if no strategy has been + This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted in above for the `-m` option. @@ -615,8 +615,8 @@ Easy case: The changes are literally the same.:: Hard case: The changes are not the same.:: This happens if the 'subsystem' rebase had conflicts, or used - `\--interactive` to omit, edit, squash, or fixup commits; or - if the upstream used one of `commit \--amend`, `reset`, or + `--interactive` to omit, edit, squash, or fixup commits; or + if the upstream used one of `commit --amend`, `reset`, or `filter-branch`. @@ -652,7 +652,7 @@ correspond to the ones before the rebase. NOTE: While an "easy case recovery" sometimes appears to be successful even in the hard case, it may have unintended consequences. For example, a commit that was removed via `git rebase - \--interactive` will be **resurrected**! + --interactive` will be **resurrected**! The idea is to manually tell 'git rebase' "where the old 'subsystem' ended and your 'topic' began", that is, what the old merge-base @@ -660,7 +660,7 @@ between them was. You will have to find a way to name the last commit of the old 'subsystem', for example: * With the 'subsystem' reflog: after 'git fetch', the old tip of - 'subsystem' is at `subsystem@\{1}`. Subsequent fetches will + 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].) * Relative to the tip of 'topic': knowing that your 'topic' has three |