git merge

来源:互联网 发布:医技软件 编辑:程序博客网 时间:2024/06/07 20:59

git-merge - Join two or more development histories together

git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]    [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]    [--[no-]allow-unrelated-histories]    [--[no-]rerere-autoupdate] [-m <msg>] [<commit>…​]git merge --abortgit merge --continue

git merge branchname # 合并分支

参考文献:
https://git-scm.com/docs/git-merge