diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 20:51:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 20:51:45 (GMT) |
| commit | d274fc093cbdcddbf9aff5f79de4e9445f3363d7 (patch) | |
| tree | 0abf168a8760bee8686a8836b4b29a366eab0118 /Documentation/git-rebase.txt | |
| parent | 1be65eda6a7018445ebdd9cfec4b1caab4db34ba (diff) | |
| parent | 6cf378f0cbe7c7f944637892caeb9058c90a185a (diff) | |
| download | git-d274fc093cbdcddbf9aff5f79de4e9445f3363d7.zip git-d274fc093cbdcddbf9aff5f79de4e9445f3363d7.tar.gz git-d274fc093cbdcddbf9aff5f79de4e9445f3363d7.tar.bz2 | |
Merge branch 'jk/doc-asciidoc-inline-literal'
Our documentation was written for an ancient version of AsciiDoc,
making the source not very readable.
By Jeff King
* jk/doc-asciidoc-inline-literal:
docs: stop using asciidoc no-inline-literal
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 841ebd6..147fa1a 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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 |