码迷,mamicode.com
首页 > 其他好文 > 详细

git cherry-pick

时间:2017-05-06 16:32:29      阅读:116      评论:0      收藏:0      [点我收藏+]

标签:hot   out   nbsp   rem   check   inno   play   release   let   

?  smartcmp-unipay git:(unipay_release) git status
On branch unipay_release
Your branch is up-to-date with ‘origin/unipay_release‘.
nothing to commit, working directory clean
?  smartcmp-unipay git:(unipay_release) git checkout unipay_demo
Switched to branch ‘unipay_demo‘
Your branch is behind ‘origin/unipay_demo‘ by 17 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
?  smartcmp-unipay git:(unipay_demo) git pull --rebase
remote: Counting objects: 15, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 15 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (15/15), done.
From http://git.hotinno.com:1688/cloudchef/smartcmp
   881516b..1178af2  physical_x86 -> origin/physical_x86
First, rewinding head to replay your work on top of it...
Fast-forwarded unipay_demo to 23ba466c8ed60a7d2f41452765b829353b0bb888.
?  smartcmp-unipay git:(unipay_demo) git status
On branch unipay_demo
Your branch is up-to-date with ‘origin/unipay_demo‘.
nothing to commit, working directory clean
?  smartcmp-unipay git:(unipay_demo) git cherry-pick 15f017961abc07a58db25e536b658e5a23b716ba
[unipay_demo 93c52db] task: 项目管理UI 的权限控制
 Date: Sat May 6 14:13:31 2017 +0800
 3 files changed, 17 insertions(+), 5 deletions(-)
?  smartcmp-unipay git:(unipay_demo) git status
On branch unipay_demo
Your branch is ahead of ‘origin/unipay_demo‘ by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working directory clean
?  smartcmp-unipay git:(unipay_demo) git push
Counting objects: 16, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (16/16), done.
Writing objects: 100% (16/16), 1.45 KiB | 0 bytes/s, done.
Total 16 (delta 11), reused 0 (delta 0)
remote:
remote: To create a merge request for unipay_demo, visit:
remote:   http://git.hotinno.com:1688/cloudchef/smartcmp/merge_requests/new?merge_request%5Bsource_branch%5D=unipay_demo
remote:
To http://xiaoqianlv:lxx19900701@git.hotinno.com:1688/cloudchef/smartcmp.git
   23ba466..93c52db  unipay_demo -> unipay_demo
?  smartcmp-unipay git:(unipay_demo) git status
On branch unipay_demo
Your branch is up-to-date with ‘origin/unipay_demo‘.
nothing to commit, working directory clean

 

git cherry-pick

标签:hot   out   nbsp   rem   check   inno   play   release   let   

原文地址:http://www.cnblogs.com/Sisiflying/p/6817008.html

(0)
(0)
   
举报
评论 一句话评论(0
登录后才能评论!
© 2014 mamicode.com 版权所有  联系我们:gaon5@hotmail.com
迷上了代码!