Mercurial > blog
changeset 129:9546304a372a
cherry-picking.
author | Oleksandr Gavenko <gavenkoa@gmail.com> |
---|---|
date | Thu, 13 Apr 2017 16:07:19 +0300 |
parents | c04289f97850 |
children | 85bd13f011bb |
files | 066f2b1f-f14d-4613-8719-bb5828a8b89a/index.rst |
diffstat | 1 files changed, 25 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/066f2b1f-f14d-4613-8719-bb5828a8b89a/index.rst Thu Apr 13 15:48:53 2017 +0300 +++ b/066f2b1f-f14d-4613-8719-bb5828a8b89a/index.rst Thu Apr 13 16:07:19 2017 +0300 @@ -99,6 +99,31 @@ $ git co master $ git merge F +==== + +What's about cherry-picking? Let's do it:: + + $ git co master + $ git cherry-pick F + +You get:: + + master + | + v dev + X -> F' | + \ v + -> A -> F -> B + +With interactive rebase remove ``F``:: + + $ git co dev + $ EDITOR=emacs git rebase -i F^1 + +After saving edits in editor you should rebase changes on new top of ``master``:: + + $ git rebase master + That's all! ====