step1.git logs 找到要退回到哪一个commit版本
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git logs
git: 'logs' is not a git command. See 'git --help'.
Did you mean this?
log
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git log
commit 0cace614f463136899e43b223420f61df58a520e
Merge: de38358 79fb91b
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:03:35 2018 +0800
修改
commit 0cace614f463136899e43b223420f61df58a520e
Merge: de38358 79fb91b
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:03:35 2018 +0800
修改
commit de38358fd76c9bbd11160001615055bc9cef7b89
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:00:30 2018 +0800
修改
commit 79fb91b33abe49fd788782cbed833f7f77c436f8
Merge: 49b47ca eb262fc
Author: 李燕杰 <liyanjie@corp.netease.com>
Date: Mon Jun 4 17:06:58 2018 +0800
Merge branch 'xuxingtao' into 'master'
Xuxingtao找到要退回的分支79fb91b33abe49fd788782cbed833f7f77c436f8 最近两次的'修改'的提交都不想要了。
step2. 通过如下命令
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git reset --hard 79fb91b33abe49fd788782cbed833f7f77c436f8
HEAD is now at 79fb91b Merge branch 'xuxingtao' into 'master'step3
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git push -f
Everything up-to-datestep4
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git push -f origin:bjliuchenhong
ssh: Could not resolve hostname origin: nodename nor servname provided, or not known
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.发现报错
具体报什么错误呢通过命令 git status
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
dev/.DS_Store
dev/hbase/day/.DS_Store
dev/hive/.DS_Store
dev/hive/adm/.DS_Store
dev/hive/adm/videocube/.DS_Store
dev/hive/adm/videouserlife/
dev/hive/bdm/.DS_Store
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/ddm/.DS_Store
dev/hive/dm/.DS_Store
dev/hive/edm/.DS_Store
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/hive/gdm/.DS_Store
dev/schedule/.DS_Store
dev/schedule/app/reader.zip
dev/schedule/daily/.DS_Store
dev/schedule/daily/model/.DS_Store
dev/schedule/edw/.DS_Store
dev/schedule/edw/galaxy.zip
dev/schedule/edw/test_ch/
dev/schedule/weekly/sdk_weekly.zip
src/.DS_Store
src/main/.DS_Store
src/main/java/.DS_Store
src/main/java/com/.DS_Store
src/main/java/com/netease/.DS_Store
src/main/java/com/netease/mobile/.DS_Store
src/main/java/com/netease/mobile/offline/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/adm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/bdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/ddm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/edm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/gdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/odm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/pojo/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/cloud/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/ds/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/muas/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/nginx/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/opencourse/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/entity/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/zylog/.DS_Store
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/main/java/com/netease/mobile/offline/util/.DS_Store
src/main/java/com/netease/mobile/offline/util/hive/.DS_Store
src/main/resources/.DS_Store
src/main/scala/.DS_Store
src/test/.DS_Store
src/test/java/.DS_Store
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)发现我在master分支。
然后需要切换到我自己的分支
step5 切换到自己分支
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git checkout bjliuchenhong
Branch bjliuchenhong set up to track remote branch bjliuchenhong from origin.
Switched to a new branch 'bjliuchenhong'
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ 然后通过git status查验是否是自己分支
Your branch is up-to-date with 'origin/bjliuchenhong'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
dev/.DS_Store
dev/hbase/day/.DS_Store
dev/hive/.DS_Store
dev/hive/adm/.DS_Store
dev/hive/adm/videocube/.DS_Store
dev/hive/adm/videouserlife/
dev/hive/bdm/.DS_Store
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/ddm/.DS_Store
dev/hive/dm/.DS_Store
dev/hive/edm/.DS_Store
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql确认是自己分支,但是有好多文件无用的
删除那些无用的之后运行命令
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git push -f
Total 0 (delta 0), reused 0 (delta 0)
To https://gitlab.ws.netease.com/mobileAnalysis/mobileOfflineAnalysis.git
+ 0cace61...79fb91b bjliuchenhong -> bjliuchenhong (forced update)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
nothing to commit, working tree clean
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git pull
Already up-to-date.
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git diff bjliuchenhong master
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ 全部命令如下
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git logs
git: 'logs' is not a git command. See 'git --help'.
Did you mean this?
log
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git log
commit 0cace614f463136899e43b223420f61df58a520e
Merge: de38358 79fb91b
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:03:35 2018 +0800
修改
commit 0cace614f463136899e43b223420f61df58a520e
Merge: de38358 79fb91b
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:03:35 2018 +0800
修改
commit de38358fd76c9bbd11160001615055bc9cef7b89
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:00:30 2018 +0800
修改
commit 79fb91b33abe49fd788782cbed833f7f77c436f8
Merge: 49b47ca eb262fc
Author: 李燕杰 <liyanjie@corp.netease.com>
Date: Mon Jun 4 17:06:58 2018 +0800
Merge branch 'xuxingtao' into 'master'
Xuxingtao
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git reset --hard 79fb91b33abe49fd788782cbed833f7f77c436f8
HEAD is now at 79fb91b Merge branch 'xuxingtao' into 'master'
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git push -f
Everything up-to-date
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git push -furce
error: unknown switch `r'
usage: git push [<options>] [<repository> [<refspec>...]]
-v, --verbose be more verbose
-q, --quiet be more quiet
--repo <repository> repository
--all push all refs
--mirror mirror all refs
-d, --delete delete refs
--tags push tags (can't be used with --all or --mirror)
-n, --dry-run dry run
--porcelain machine-readable output
-f, --force force updates
--force-with-lease[=<refname>:<expect>]
require old value of ref to be at this value
--recurse-submodules[=<check|on-demand|no>]
control recursive pushing of submodules
--thin use thin pack
--receive-pack <receive-pack>
receive pack program
--exec <receive-pack>
receive pack program
-u, --set-upstream set upstream for git pull/status
--progress force progress reporting
--prune prune locally removed refs
--no-verify bypass pre-push hook
--follow-tags push missing but relevant tags
--signed[=<yes|no|if-asked>]
GPG sign the push
--atomic request atomic transaction on remote side
-o, --push-option <server-specific>
option to transmit
-4, --ipv4 use IPv4 addresses only
-6, --ipv6 use IPv6 addresses only
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git push -f origin:bjliuchenhong
ssh: Could not resolve hostname origin: nodename nor servname provided, or not known
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
dev/.DS_Store
dev/hbase/day/.DS_Store
dev/hive/.DS_Store
dev/hive/adm/.DS_Store
dev/hive/adm/videocube/.DS_Store
dev/hive/adm/videouserlife/
dev/hive/bdm/.DS_Store
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/ddm/.DS_Store
dev/hive/dm/.DS_Store
dev/hive/edm/.DS_Store
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/hive/gdm/.DS_Store
dev/schedule/.DS_Store
dev/schedule/app/reader.zip
dev/schedule/daily/.DS_Store
dev/schedule/daily/model/.DS_Store
dev/schedule/edw/.DS_Store
dev/schedule/edw/galaxy.zip
dev/schedule/edw/test_ch/
dev/schedule/weekly/sdk_weekly.zip
src/.DS_Store
src/main/.DS_Store
src/main/java/.DS_Store
src/main/java/com/.DS_Store
src/main/java/com/netease/.DS_Store
src/main/java/com/netease/mobile/.DS_Store
src/main/java/com/netease/mobile/offline/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/adm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/bdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/ddm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/edm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/gdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/odm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/pojo/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/cloud/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/ds/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/muas/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/nginx/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/opencourse/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/entity/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/zylog/.DS_Store
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/main/java/com/netease/mobile/offline/util/.DS_Store
src/main/java/com/netease/mobile/offline/util/hive/.DS_Store
src/main/resources/.DS_Store
src/main/scala/.DS_Store
src/test/.DS_Store
src/test/java/.DS_Store
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
dev/.DS_Store
dev/hbase/day/.DS_Store
dev/hive/.DS_Store
dev/hive/adm/.DS_Store
dev/hive/adm/videocube/.DS_Store
dev/hive/adm/videouserlife/
dev/hive/bdm/.DS_Store
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/ddm/.DS_Store
dev/hive/dm/.DS_Store
dev/hive/edm/.DS_Store
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/hive/gdm/.DS_Store
dev/schedule/.DS_Store
dev/schedule/app/reader.zip
dev/schedule/daily/.DS_Store
dev/schedule/daily/model/.DS_Store
dev/schedule/edw/.DS_Store
dev/schedule/edw/galaxy.zip
dev/schedule/edw/test_ch/
dev/schedule/weekly/sdk_weekly.zip
src/.DS_Store
src/main/.DS_Store
src/main/java/.DS_Store
src/main/java/com/.DS_Store
src/main/java/com/netease/.DS_Store
src/main/java/com/netease/mobile/.DS_Store
src/main/java/com/netease/mobile/offline/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/adm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/bdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/ddm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/edm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/gdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/odm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/pojo/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/cloud/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/ds/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/muas/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/nginx/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/opencourse/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/entity/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/zylog/.DS_Store
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/main/java/com/netease/mobile/offline/util/.DS_Store
src/main/java/com/netease/mobile/offline/util/hive/.DS_Store
src/main/resources/.DS_Store
src/main/scala/.DS_Store
src/test/.DS_Store
src/test/java/.DS_Store
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git checkout bjliuchenhong
Branch bjliuchenhong set up to track remote branch bjliuchenhong from origin.
Switched to a new branch 'bjliuchenhong'
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
dev/.DS_Store
dev/hbase/day/.DS_Store
dev/hive/.DS_Store
dev/hive/adm/.DS_Store
dev/hive/adm/videocube/.DS_Store
dev/hive/adm/videouserlife/
dev/hive/bdm/.DS_Store
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/ddm/.DS_Store
dev/hive/dm/.DS_Store
dev/hive/edm/.DS_Store
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/hive/gdm/.DS_Store
dev/schedule/.DS_Store
dev/schedule/app/reader.zip
dev/schedule/daily/.DS_Store
dev/schedule/daily/model/.DS_Store
dev/schedule/edw/.DS_Store
dev/schedule/edw/galaxy.zip
dev/schedule/edw/test_ch/
dev/schedule/weekly/sdk_weekly.zip
src/.DS_Store
src/main/.DS_Store
src/main/java/.DS_Store
src/main/java/com/.DS_Store
src/main/java/com/netease/.DS_Store
src/main/java/com/netease/mobile/.DS_Store
src/main/java/com/netease/mobile/offline/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/adm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/bdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/ddm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/edm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/gdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/odm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/pojo/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/cloud/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/ds/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/muas/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/nginx/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/opencourse/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/entity/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/zylog/.DS_Store
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/main/java/com/netease/mobile/offline/util/.DS_Store
src/main/java/com/netease/mobile/offline/util/hive/.DS_Store
src/main/resources/.DS_Store
src/main/scala/.DS_Store
src/test/.DS_Store
src/test/java/.DS_Store
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git stash
No local changes to save
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
dev/.DS_Store
dev/hbase/day/.DS_Store
dev/hive/.DS_Store
dev/hive/adm/.DS_Store
dev/hive/adm/videocube/.DS_Store
dev/hive/adm/videouserlife/
dev/hive/bdm/.DS_Store
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/ddm/.DS_Store
dev/hive/dm/.DS_Store
dev/hive/edm/.DS_Store
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/hive/gdm/.DS_Store
dev/schedule/.DS_Store
dev/schedule/app/reader.zip
dev/schedule/daily/.DS_Store
dev/schedule/daily/model/.DS_Store
dev/schedule/edw/.DS_Store
dev/schedule/edw/galaxy.zip
dev/schedule/edw/test_ch/
dev/schedule/weekly/sdk_weekly.zip
src/.DS_Store
src/main/.DS_Store
src/main/java/.DS_Store
src/main/java/com/.DS_Store
src/main/java/com/netease/.DS_Store
src/main/java/com/netease/mobile/.DS_Store
src/main/java/com/netease/mobile/offline/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/adm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/bdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/ddm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/edm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/gdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/odm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/pojo/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/cloud/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/ds/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/muas/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/nginx/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/opencourse/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/entity/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/zylog/.DS_Store
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/main/java/com/netease/mobile/offline/util/.DS_Store
src/main/java/com/netease/mobile/offline/util/hive/.DS_Store
src/main/resources/.DS_Store
src/main/scala/.DS_Store
src/test/.DS_Store
src/test/java/.DS_Store
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git pull
remote: Counting objects: 162, done.
remote: Compressing objects: 100% (49/49), done.
remote: Total 72 (delta 34), reused 37 (delta 11)
Unpacking objects: 100% (72/72), done.
From https://gitlab.ws.netease.com/mobileAnalysis/mobileOfflineAnalysis
* [new branch] baimaolong -> origin/baimaolong
* [new branch] bjlipeng -> origin/bjlipeng
44044a9..aecae04 bjliuxinhua -> origin/bjliuxinhua
* [new branch] bjyaobin -> origin/bjyaobin
bbc48ce..5f0a4a9 bjzhangsenzhi -> origin/bjzhangsenzhi
* [new branch] bjzhangshuo1 -> origin/bjzhangshuo1
* [new branch] fengyan -> origin/fengyan
bfce1e6..12c3abe hanhuaimei_editor -> origin/hanhuaimei_editor
* [new branch] husong -> origin/husong
* [new branch] juyifan -> origin/juyifan
* [new branch] liouyang -> origin/liouyang
* [new branch] lipeidian -> origin/lipeidian
* [new branch] liruolin -> origin/liruolin
* [new branch] mikai -> origin/mikai
* [new branch] panlong -> origin/panlong
* [new branch] quzhongshan -> origin/quzhongshan
070c9f2..a3c49a6 tancheng -> origin/tancheng
* [new branch] wangning -> origin/wangning
693648a..ed60cb3 xiaoyj -> origin/xiaoyj
* [new branch] xuxingtao -> origin/xuxingtao
* [new branch] yaojianxin -> origin/yaojianxin
* [new branch] yexin -> origin/yexin
4e675a0..cd6d56c zhaowei -> origin/zhaowei
Already up-to-date.
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.DS_Store
dev/.DS_Store
dev/hbase/day/.DS_Store
dev/hive/.DS_Store
dev/hive/adm/.DS_Store
dev/hive/adm/videocube/.DS_Store
dev/hive/adm/videouserlife/
dev/hive/bdm/.DS_Store
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/ddm/.DS_Store
dev/hive/dm/.DS_Store
dev/hive/edm/.DS_Store
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/hive/gdm/.DS_Store
dev/schedule/.DS_Store
dev/schedule/app/reader.zip
dev/schedule/daily/.DS_Store
dev/schedule/daily/model/.DS_Store
dev/schedule/edw/.DS_Store
dev/schedule/edw/galaxy.zip
dev/schedule/edw/test_ch/
dev/schedule/weekly/sdk_weekly.zip
src/.DS_Store
src/main/.DS_Store
src/main/java/.DS_Store
src/main/java/com/.DS_Store
src/main/java/com/netease/.DS_Store
src/main/java/com/netease/mobile/.DS_Store
src/main/java/com/netease/mobile/offline/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/adm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/bdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/ddm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/edm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/gdm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/odm/.DS_Store
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/pojo/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/cloud/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/ds/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/muas/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/nginx/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/opencourse/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/sdk/entity/.DS_Store
src/main/java/com/netease/mobile/offline/pojo/zylog/.DS_Store
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/main/java/com/netease/mobile/offline/util/.DS_Store
src/main/java/com/netease/mobile/offline/util/hive/.DS_Store
src/main/resources/.DS_Store
src/main/scala/.DS_Store
src/test/.DS_Store
src/test/java/.DS_Store
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
dev/hive/adm/videouserlife/
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/schedule/app/reader.zip
dev/schedule/edw/galaxy.zip
dev/schedule/edw/test_ch/
dev/schedule/weekly/sdk_weekly.zip
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm dev/schedule/app/reader.zip
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm dev/schedule/edw/galaxy.zip
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm dev/schedule/weekly/sdk_weekly.zip
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
dev/hive/adm/videouserlife/
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/schedule/edw/test_ch/
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
dev/hive/adm/videouserlife/
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/schedule/edw/test_ch/
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git log
commit 0cace614f463136899e43b223420f61df58a520e
Merge: de38358 79fb91b
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:03:35 2018 +0800
修改
commit de38358fd76c9bbd11160001615055bc9cef7b89
Author: bjliuchenhong <bjliuchenhong@corp.netease.com>
Date: Mon Jun 4 18:00:30 2018 +0800
修改
commit 79fb91b33abe49fd788782cbed833f7f77c436f8
Merge: 49b47ca eb262fc
Author: 李燕杰 <liyanjie@corp.netease.com>
Date: Mon Jun 4 17:06:58 2018 +0800
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git reset --hard 79fb91b33abe49fd788782cbed833f7f77c436f8
HEAD is now at 79fb91b Merge branch 'xuxingtao' into 'master'
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git merge master
Already up-to-date.
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is behind 'origin/bjliuchenhong' by 2 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Untracked files:
(use "git add <file>..." to include in what will be committed)
dev/hive/adm/videouserlife/
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/schedule/edw/test_ch/
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git stash
No local changes to save
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is behind 'origin/bjliuchenhong' by 2 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Untracked files:
(use "git add <file>..." to include in what will be committed)
dev/hive/adm/videouserlife/
dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
dev/schedule/edw/test_ch/
src/main/java/com/netease/mobile/offline/mapred/liubingwei/
src/main/java/com/netease/mobile/offline/mapred/test/
src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
src/test/java/com/netease/mobile/offline/mapred/ch/
src/test/java/mobileofflineanalysis/chenhong/
nothing added to commit but untracked files present (use "git add" to track)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r dev/hive/adm/videouserlife/
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r dev/hive/bdm/dmp/sh_bdm_kaola_user_portrait_d.sh
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r dev/hive/edm/video/sh_tmp_ch_tb_edm_galaxy_video_relate_exposure_day.sh
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r dev/hive/edm/video/tmp_ch_tb_EDM_GALAXY_VIDEO_RELATE_EXPOSURE_DAY.sql
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r dev/schedule/edw/test_ch/
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r src/main/java/com/netease/mobile/offline/mapred/liubingwei/
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r src/main/java/com/netease/mobile/offline/mapred/test/
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r src/main/java/com/netease/mobile/offline/udf/UDFJsonArray.java
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r src/test/java/com/netease/mobile/offline/mapred/ch/
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ rm -r src/test/java/mobileofflineanalysis/chenhong/
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is behind 'origin/bjliuchenhong' by 2 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git push -f
Total 0 (delta 0), reused 0 (delta 0)
To https://gitlab.ws.netease.com/mobileAnalysis/mobileOfflineAnalysis.git
+ 0cace61...79fb91b bjliuchenhong -> bjliuchenhong (forced update)
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git status
On branch bjliuchenhong
Your branch is up-to-date with 'origin/bjliuchenhong'.
nothing to commit, working tree clean
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git pull
Already up-to-date.
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$ git diff bjliuchenhong master
JLSdeMacBook-Pro:mobileOfflineAnalysis jls$
没有评论