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 /merge-strategies.txt | |
| parent | 3b70d3c788363466e56886d9fc5d316659cda627 (diff) | |
| download | git-htmldocs-bf984de67c8dac8e5143a680957a4c5f95d0078f.tar.gz | |
Autogenerated HTML docs for v1.6.6-rc0
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index 4365b7e84..42910a3d5 100644 --- a/merge-strategies.txt +++ b/merge-strategies.txt @@ -29,8 +29,9 @@ octopus:: pulling or merging more than one branch. ours:: - This resolves any number of heads, but the result of the - merge is always the current branch head. It is meant to + This resolves any number of heads, but the resulting tree of the + merge is always that of the current branch head, effectively + ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. |