2017-04-20 50 views
1

我需要解释一下Git,这对我来说有点新鲜。Git结账和远程跟踪误解

我来自老同学SVN,每个人都快点承诺远程仓库来你们不知道冲突....这一次完成:)。

嗯,是我用git三个命令:)

C:\webs\carrefour-france\crf-fra>git checkout -b fflbranche origin/dev-17.5-tma 
Switched to a new branch 'fflbranche' 
Branch fflbranche set up to track remote branch dev-17.5-tma from origin. 

C:\webs\carrefour-france\crf-fra>git status 
On branch fflbranche 
Your branch is up-to-date with 'origin/dev-17.5-tma'. 
Untracked files: 
    (use "git add <file>..." to include in what will be committed) 

     crf-fra-core/src/main/documentation/diagramme.vpp.bak_000f 
     crf-fra-core/src/main/documentation/diagramme.vpp.vbak 
     crf-fra-core/src/main/documentation/diagramme.vux 
     crf-fra-eshop-fo/src/main/documentation/diagrammes.vpp.bak_000f 
     crf-fra-eshop-fo/src/main/documentation/diagrammes.vpp.vbak 
     crf-fra-eshop-fo/src/main/documentation/diagrammes.vux 
     src/main/documentation/Architecture.vpp.bak_000f 
     src/main/documentation/Architecture.vpp.vbak 
     src/main/documentation/Architecture.vux 

nothing added to commit but untracked files present (use "git add" to track) 

C:\webs\carrefour-france\crf-fra> 

2)

C:\webs\carrefour-france\crf-fra>git branch --list 
    dev-17.5 
    dev-17.5-art04 
* fflbranche 
    master 
    origin/dev-17.5 

C:\webs\carrefour-france\crf-fra> 

3)

C:\webs\carrefour-france\crf-fra>git remote show origin 
Username for 'http://kazan.priv.atos.fr': a665145 
Password for 'http://[email protected]': 
* remote origin 
    Fetch URL: http://kazan.priv.atos.fr/git/crf-fra 
    Push URL: http://kazan.priv.atos.fr/git/crf-fra 
    HEAD branch: master 
    Remote branches: 
    17.2-eligibilite   tracked 
    dev-15.3.2-optimAdmin  tracked 
    dev-16.0.1     tracked 
    dev-16.1-old    tracked 
    ...(much more) 
    stable-17.3-monitoringSF tracked 
    stable-17.3.1    tracked 
    stable-CONF-ENV   tracked 
    tmp-trunk     tracked 
    Local branches configured for 'git pull': 
    dev-17.5  merges with remote dev-17.5 
    dev-17.5-art04 merges with remote dev-17.5-art04 
    fflbranche  merges with remote dev-17.5-tma 
    master   merges with remote master 
    Local refs configured for 'git push': 
    dev-17.5  pushes to dev-17.5  (local out of date) 
    dev-17.5-art04 pushes to dev-17.5-art04 (up to date) 
    master   pushes to master   (local out of date) 

我的问题是:

为什么在上次输出时,在“为git push配置的本地引用”:“部分它没有出现”fflbranche“。这是否意味着如果我在本地分支上修改文件,我无法将其推送到远程跟踪分支?

谢谢你的灯!

回答

0

为什么在最后输出的,在“配置‘混帐推’本地裁判:”部分没有出现“fflbranche”

我想你还没有被推到远程却又如此,混帐没有保存它。你显然可以推动远离fflbranche分支。

$ git checkout fflbranche 
// do changes & commit 

$ git push -u origin fflbranche  
# -u = --set-upstream tells git to remember the parameters, so that next time you can simply run 'git push' 

$ git remote show origin 
+0

非常感谢。你说得对,我还没有推动。 –

0

Git分支是懒惰的,git不会创建本地分支,除非您命令它这样做。

通常情况下,一个git checkout将初始化与远程状态的分支,并设置跟踪状态正常。

如果你想推一个分支不跟踪(这往往是新的分支),设置产地也适用:

git push --set-upstream origin "$(git-branch-current 2> /dev/null)" 

你有多个被按压遥控器,让你还想来取代origin你想要的遥控器。