创建分支
git branch 1.1
#查看分支
git branch
#签出分支
git checkout 1.1
#以下为分支上的修改#提交修改内容
git add test.txtgit commit -m 'add test.txt'git pushgit add test2.txtgit commit -m 'add test2.txt'git push
#查看提交的版本日志
git log#以下为输出部分的版本日志信息commit 5fdaca2be247204f9e2e08bd2f455174d0a93a32 (HEAD -> 1.1, origin/1.1)Author: feiyangderiziDate: Mon Nov 7 20:26:04 +0800add test2.txtcommit 7cef89d833fdaff16f97b13a412fd15226c190efAuthor: feiyangderiziDate: Mon Nov 7 20:24:18 +0800modified test.txtcommit 4eb0ce5b6c665b79c36c3de03192e1437ddf7b03Author: feiyangderiziDate: Mon Nov 7 20:19:26 +0800add test.txt
#切换到主干,选择指定版本合并到主干
git checkout maingit cherry-pick 4eb0ce5b6c665b79c36c3de03192e1437ddf7b03git commit -m 'merger from 1.1'git push
Git从1.7.2版本开始支持批量cherry-pick,就是一次可以cherry-pick一个区间的commit。 git cherry-pick <start-commit-id>..<end-commit-id> git cherry-pick <start-commit-id>^..<end-commit-id> 前者表示把<start-commit-id>到<end-commit-id>之间(左开右闭,不包含start-commit-id)的提交cherry-pick到当前分支; 后者有"^"标志的表示把<start-commit-id>到<end-commit-id>之间(闭区间,包含start-commit-id)的提交cherry-pick到当前分支。 其中,<start-commit-id>到<end-commit-id>只需要commit-id的前6位即可,并且<start-commit-id>在时间上必须早于<end-commit-id>