美文网首页
创建新分支提交代码&删除分支

创建新分支提交代码&删除分支

作者: 哈哈撒拉嘿 | 来源:发表于2018-11-12 18:33 被阅读0次

    miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps

    $ cd SystemUI/

    miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/SystemUI

    $ git branch -vva

      remotes/hsae/cn202sr    998f1f2 [SystemUI] modify gps

      remotes/hsae/cn202sr-id b81e534 [systemui] 删除用户头像和用户信息,删除语音图标.

      remotes/hsae/master    9cc158a Initial empty repository

      remotes/m/cn202sr-id    -> hsae/cn202sr-id

    * (非分支)              b81e534 [systemui] 删除用户头像和用户信息,删除语音图标.

    miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/SystemUI

    $ git checkout -b cn202sr-id hsae/cn202sr-id

    分支 'cn202sr-id' 设置为跟踪来自 'hsae' 的远程分支 'cn202sr-id'。

    切换到一个新分支 'cn202sr-id'

    miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/SystemUI

    $ git branch -vva

    * cn202sr-id              b81e534 [hsae/cn202sr-id] [systemui] 删除用户头像和用户信息,删除语音图标.

      remotes/hsae/cn202sr    998f1f2 [SystemUI] modify gps

      remotes/hsae/cn202sr-id b81e534 [systemui] 删除用户头像和用户信息,删除语音图标.

      remotes/hsae/master    9cc158a Initial empty repository

      remotes/m/cn202sr-id    -> hsae/cn202sr-id

    miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/SystemUI

    $ git pull

    remote: Counting objects: 3102, done

    remote: Finding sources: 100% (22/22)

    remote: Total 22 (delta 12), reused 21 (delta 12)

    展开对象中: 100% (22/22), 完成.

    来自 ssh://192.168.20.45:29418/Android/oreo/platform/packages/apps/Hsae_Apps/SystemUI

      b81e534..a42ae84  cn202sr-id -> hsae/cn202sr-id

    更新 b81e534..a42ae84

    Fast-forward

    res/layout/system_statusbar_icon.xml                                    |  4 +---

    src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----

    2 files changed, 73 insertions(+), 7 deletions(-)

    miaojianyuwx@MIAOJIANYU /cygdrive/d/git_repos/id_1107/packages/apps/Hsae_Apps/SystemUI

    $ git branch -vva

    * cn202sr-id              a42ae84 [hsae/cn202sr-id] [SystemUI] display wifi icon

      remotes/hsae/cn202sr    998f1f2 [SystemUI] modify gps

      remotes/hsae/cn202sr-id a42ae84 [SystemUI] display wifi icon

      remotes/hsae/master    9cc158a Initial empty repository

      remotes/m/cn202sr-id    -> hsae/cn202sr-id

    代码提交:删除分支

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app

    $ ls

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app

    $ rm -rf Launcher/

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app

    $ git clone ssh://miaojianyuwx@192.168.20.45:29418/Android/oreo/platform/packages/apps/Hsae_Apps/Launcher

    正克隆到 'Launcher'...

    remote: Counting objects: 305, done

    remote: Finding sources: 100% (90/90)

    remote: Total 1150 (delta 17), reused 1109 (delta 17)

    接收对象中: 100% (1150/1150), 3.32 MiB | 11.97 MiB/s, 完成.

    处理 delta 中: 100% (471/471), 完成.

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app

    $ cd Launcher/

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app/Launcher

    $ git checkout -b cn202sr-id origin/cn202sr-id

    分支 'cn202sr-id' 设置为跟踪来自 'origin' 的远程分支 'cn202sr-id'。

    切换到一个新分支 'cn202sr-id'

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app/Launcher

    $ git status

    位于分支 cn202sr-id

    您的分支与上游分支 'origin/cn202sr-id' 一致。

    尚未暂存以备提交的变更:

      (使用 "git add <文件>..." 更新要提交的内容)

      (使用 "git checkout -- <文件>..." 丢弃工作区的改动)

            修改:    src/com/hsae/cn202sr/launcher/LauncherActivity.java

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app/Launcher

    $ git add .

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app/Launcher

    $ git commit -m"2222"

    [cn202sr-id 5c75763] 2222

    1 file changed, 1 insertion(+), 1 deletion(-)

    miaojianyuwx@MIAOJIANYU /cygdrive/d/hsae_app/Launcher

    $ git log -p -1

    commit 5c75763136bbf0aed0e65281544204bb281b2300 (HEAD -> cn202sr-id)

    Author: miaojianyuwx <miaojy@cn8bit.com>

    Date:  Fri Nov 9 09:39:29 2018 +0800

        2222

        Change-Id: Ifd4dfbe26919e7ead4905d6d31f1fcab11864b98

    diff --git a/src/com/hsae/cn202sr/launcher/LauncherActivity.java b/src/com/hsae/cn202sr/launcher/LauncherActivity.java

    index 1157061..ede8ef5 100644

    --- a/src/com/hsae/cn202sr/launcher/LauncherActivity.java

    +++ b/src/com/hsae/cn202sr/launcher/LauncherActivity.java

    @@ -1,5 +1,5 @@

    package com.hsae.cn202sr.launcher;

    -

    +//fefe

    import android.annotation.SuppressLint;

    import android.app.Activity;

    import android.app.AlertDialog;

    相关文章

      网友评论

          本文标题:创建新分支提交代码&删除分支

          本文链接:https://www.haomeiwen.com/subject/abncfqtx.html