summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 581412c)
raw | patch | inline | side by side (parent: 581412c)
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
Thu, 21 May 2009 09:47:07 +0000 (19:47 +1000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 21 May 2009 14:33:23 +0000 (07:33 -0700) |
git-rebase.sh does not seem to support this.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt | patch | blob | history |
index 3d5a066c31675e502eb027dde824d1966c9c0f09..26f3b7b2b0daad0affb36e6514156520a693b164 100644 (file)
-s <strategy>::
--strategy=<strategy>::
- Use the given merge strategy; can be supplied more than
- once to specify them in the order they should be tried.
+ 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.