git
Pro Git
Atlassian Git Tutorial
Pro Git 简体中文翻译
GitX
laobaoabc
V2EX  ›  git

git merge 的一个问题

  •  
  •   laobaoabc · Mar 16, 2017 · 2944 views
    This topic created in 3365 days ago, the information mentioned may be changed or developed.

    请问下

    git merge 的默认行为是什么呢,后面不加分支

    是 git merge origin/current_branch 吗

    用 fetch + merge 感觉是这样的

    一直没查到这个。。。

    3 replies    2017-03-16 20:20:39 +08:00
    flniu
        1
    flniu  
       Mar 16, 2017
    git help merge

    "If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page."
    laobaoabc
        2
    laobaoabc  
    OP
       Mar 16, 2017
    @flniu 非常感谢
    blackywkl
        3
    blackywkl  
       Mar 16, 2017
    直接 git merge 不加任何参数的话,会将当前分支的上游分支合并进来的
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Solana   ·   5086 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 34ms · UTC 09:44 · PVG 17:44 · LAX 02:44 · JFK 05:44
    ♥ Do have faith in what you're doing.