Thursday, 3 November 2016

more git command (git svn, git cherry-pick)

27. git cherry-pick
Apply the changes introduced by some existing commits
I have a commit on dev, which has conflicts with current master,
I checkout a new branch new_dev, and cherry-pick the top commit on dev
and apply it to new_dev, if there is no conflicts, you don't have to
merge the conflicts for other commits, just cherry-pick  the useful commit and
discard all the other commits.

git cherry-pick a96001889dfe2259aca963ae3380900eaad406fa
http://blog.csdn.net/wh_19910525/article/details/7554430


28. Use git svn to commit a git changeset to svn repository
git svn dcommit --interative

No comments:

Post a Comment