diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-23 06:11:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-23 06:11:19 +0000 |
| commit | bf984de67c8dac8e5143a680957a4c5f95d0078f (patch) | |
| tree | 55528481d53d832804b04554a586b505c656e1ef /git-rebase.txt | |
| parent | 3b70d3c788363466e56886d9fc5d316659cda627 (diff) | |
| download | git-htmldocs-bf984de67c8dac8e5143a680957a4c5f95d0078f.tar.gz | |
Autogenerated HTML docs for v1.6.6-rc0
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 33e0ef1f6..ca5e1e865 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -228,13 +228,23 @@ OPTIONS Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. ++ +Note that a rebase merge works by replaying each commit from the working +branch on top of the <upstream> branch. Because of this, when a merge +conflict happens, the side reported as 'ours' is the so-far rebased +series, starting with <upstream>, and 'theirs' is the working branch. In +other words, the sides are swapped. -s <strategy>:: --strategy=<strategy>:: Use the given merge strategy. - If there is no `-s` option, a built-in list of strategies - is used instead ('git-merge-recursive' when merging a single - head, 'git-merge-octopus' otherwise). This implies --merge. + If there is no `-s` option 'git-merge-recursive' is used + instead. This implies --merge. ++ +Because 'git-rebase' replays each commit from the working branch +on top of the <upstream> branch using the given strategy, using +the 'ours' strategy simply discards all patches from the <branch>, +which makes little sense. -q:: --quiet:: |