git分支

Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.


Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)


        modified:   app/src/main/java/com/yuanxin/clan/nokillservices/PhoneService.java


no changes added to commit (use "git add" and/or "git commit -a")


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git checkout .


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git checkout -b develop
fatal: A branch named 'develop' already exists.


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git checkout -b dev
Switched to a new branch 'dev'


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git branch
* dev
  develop
  master


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git checkout dev
Switched to branch 'dev'


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git branch -a
* dev
  develop
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
  remotes/origin/remote_cobub


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)

$

查看分支，提交分支到主分支

Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git stash
Saved working directory and index state WIP on dev: 404d8be 优化servicenokill


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git pull
remote: Counting objects: 76, done
remote: Finding sources: 100% (50/50)
remote: Getting sizes: 100% (58/58)
remote: Compressing objects:  99% (279227/280053)
remote: Total 50 (delta 15), reused 38 (delta 15)
Unpacking objects: 100% (50/50), done.
From http://192.168.1.111:10101/r/yuanxinclan_new
   404d8be..ea0ddf9  master     -> origin/master
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.


    git pull <remote> <branch>


If you wish to set tracking information for this branch you can do so with:


    git branch --set-upstream-to=origin/<branch> dev




Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git  stash pop
On branch dev
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)


        modified:   app/build.gradle
        modified:   app/src/main/java/com/yuanxin/clan/mvp/service/UpdateAppService.java
        modified:   app/src/main/res/mipmap-xhdpi/app.png
        modified:   app/src/main/res/mipmap-xxhdpi/app.png


no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (b4625a7d1595525f3bfe2e16193461cd585dc2c9)


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git  add .


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git  commit
[dev add3556] 修改log
 4 files changed, 2 insertions(+), 2 deletions(-)
 rewrite app/src/main/res/mipmap-xhdpi/app.png (99%)
 rewrite app/src/main/res/mipmap-xxhdpi/app.png (99%)


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git push
fatal: The current branch dev has no upstream branch.
To push the current branch and set the remote as upstream, use


    git push --set-upstream origin dev




Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ lgq
bash: lgq: command not found


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git  push
fatal: The current branch dev has no upstream branch.
To push the current branch and set the remote as upstream, use


    git push --set-upstream origin dev




Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git log
commit add355650610177aa71e3ecebcf9b20e0e06d1e7 (HEAD -> dev)
Author: lgq <13164716840@163.com>
Date:   Mon Mar 12 16:00:02 2018 +0800


    修改log


commit 404d8be1551522282f210a8e328712960f2ba96c (master)
Author: lgq <13164716840@163.com>
Date:   Thu Mar 8 18:03:05 2018 +0800


    优化servicenokill


commit d966450b44cef685f4958e0d117e118b317c4fe4
Author: lgq <13164716840@163.com>
Date:   Thu Mar 8 13:39:10 2018 +0800


    nokillservice


commit a0a5641020c48ac1f170acd89b8f91611ef7be66
Author: lgq <13164716840@163.com>
Date:   Wed Mar 7 11:05:18 2018 +0800


    添加商圈搜索，展会分享


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git branch
* dev
  develop
  master


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (dev)
$ git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git cherry-pick maste
fatal: bad revision 'maste'


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git cherry-pick add355650610177aa71e3ecebcf9b20e0e06d1e7
[master 2785557] 修改log
 Date: Mon Mar 12 16:00:02 2018 +0800
 4 files changed, 2 insertions(+), 2 deletions(-)
 rewrite app/src/main/res/mipmap-xhdpi/app.png (99%)
 rewrite app/src/main/res/mipmap-xxhdpi/app.png (99%)


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git push
Username for 'http://192.168.1.111:10101': lgq
To http://192.168.1.111:10101/r/yuanxinclan_new.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'http://192.168.1.111:10101/r/yuanxinclan_new.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git pull


Removing app/src/main/java/com/yuanxin/clan/nokillservices/SimpleMailSender.java
Removing app/src/main/java/com/yuanxin/clan/nokillservices/PhoneService.java
Removing app/src/main/java/com/yuanxin/clan/nokillservices/OtherOperatorService.java
Removing app/src/main/java/com/yuanxin/clan/nokillservices/OnePiexlActivity.java
Removing app/src/main/java/com/yuanxin/clan/nokillservices/MyBroadcastReciver.java
Removing app/src/main/java/com/yuanxin/clan/nokillservices/MyAuthenticator.java
Removing app/src/main/java/com/yuanxin/clan/nokillservices/MailSenderInfo.java
Auto-merging app/build.gradle
Merge made by the 'recursive' strategy.
 app/build.gradle                                   |   4 -
 app/src/main/AndroidManifest.xml                   |  17 -
 .../java/com/yuanxin/clan/core/HomeFragment.java   |   2 +-
 .../java/com/yuanxin/clan/core/MainActivity.java   |   5 -
 .../clan/core/activity/QuanziDetailwbActivity.java |   6 +-
 .../com/yuanxin/clan/core/huanxin/DemoHelper.java  |   1 -
 .../java/com/yuanxin/clan/mvp/MainApplication.java |   5 -
 .../yuanxin/clan/mvp/view/MainBaseActivity.java    |   4 +-
 .../clan/nokillservices/MailSenderInfo.java        | 143 ------
 .../clan/nokillservices/MyAuthenticator.java       |  24 -
 .../clan/nokillservices/MyBroadcastReciver.java    |  42 --
 .../clan/nokillservices/OnePiexlActivity.java      |  66 ---
 .../clan/nokillservices/OtherOperatorService.java  | 515 ---------------------
 .../yuanxin/clan/nokillservices/PhoneService.java  | 215 ---------
 .../clan/nokillservices/SimpleMailSender.java      | 117 -----
 app/src/main/res/values/styles.xml                 |   4 -
 16 files changed, 6 insertions(+), 1164 deletions(-)
 delete mode 100644 app/src/main/java/com/yuanxin/clan/nokillservices/MailSenderInfo.java
 delete mode 100644 app/src/main/java/com/yuanxin/clan/nokillservices/MyAuthenticator.java
 delete mode 100644 app/src/main/java/com/yuanxin/clan/nokillservices/MyBroadcastReciver.java
 delete mode 100644 app/src/main/java/com/yuanxin/clan/nokillservices/OnePiexlActivity.java
 delete mode 100644 app/src/main/java/com/yuanxin/clan/nokillservices/OtherOperatorService.java
 delete mode 100644 app/src/main/java/com/yuanxin/clan/nokillservices/PhoneService.java
 delete mode 100644 app/src/main/java/com/yuanxin/clan/nokillservices/SimpleMailSender.java


Administrator@PC-20170531NDJV MINGW64 /f/sgit_yuanxin/yuanxinclan_new (master)
$ git push
Username for 'http://192.168.1.111:10101': lgq
Counting objects: 30, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (24/24), done.
Writing objects: 100% (30/30), 41.66 KiB | 10.41 MiB/s, done.
Total 30 (delta 14), reused 0 (delta 0)
remote: Resolving deltas: 100% (14/14)
remote: Updating references: 100% (1/1)
To http://192.168.1.111:10101/r/yuanxinclan_new.git
   ea0ddf9..973d23a  master -> master