找回差點丟失的commit
2015-12-02 15:20
423 查看
因為作修改的時候,本身不在任何分支上,commit之後又沒有及時的push,造成過了個週末回來以後,一執行repo
sync,就discarding
commits了。。。悲劇啊。。。還好補救回來了,引以為戒,以後一定要先checkout到分支上再修改
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git reflog
612952f HEAD@{0}: checkout: moving from
612952fbfad9e480d5cd3486034399644393c253 to anrom-4.0
612952f HEAD@{1}: checkout: moving from
a873309d7579ccceff13a1881bbc23740d62fe83 to
612952fbfad9e480d5cd3486034399644393c253
a873309 HEAD@{2}: commit: add new
functions to install packages in different zone
--這一條就是差點丟失的commit,編號a873309
612952f HEAD@{3}: merge
612952fbfad9e480d5cd3486034399644393c253: Fast-forward
8ca02a2 HEAD@{4}: merge
8ca02a2fb9d3d620bd3efd35ac847e30a95b781a: Fast-forward
a444826 HEAD@{5}: merge
a444826db727abdebddc8dc05d95881d3c050c99: Fast-forward
9b6baa2 HEAD@{6}: merge
9b6baa23b6b9207208ab7f6ca2bddb415c3f2db1: Fast-forward
8ef34c7 HEAD@{7}: merge
8ef34c751858793b4550149f541bde54073755be: Fast-forward
4cb7a72 HEAD@{8}: merge
4cb7a724f46c8d811b6cca031909def2f4d82bf1: Fast-forward
bf9fedc HEAD@{9}: checkout: moving from
2f807712c5a375871723a6b4edf818ff83855ef9 to
bf9fedce275469e2f4ff31d60080026afac68f72
2f80771 HEAD@{10}: checkout: moving from
90315aec1eacc95aba87d9c964d6f21407f0486f to
2f807712c5a375871723a6b4edf818ff83855ef9
90315ae HEAD@{11}: checkout: moving from
0acf66000a4b10a667ddf840ef27ab33822d19ed to
90315aec1eacc95aba87d9c964d6f21407f0486f
0acf660 HEAD@{12}: checkout: moving from
09a65e0b5bdd7c3639e30bb4bbf9699c4700627f to
0acf66000a4b10a667ddf840ef27ab33822d19ed
09a65e0 HEAD@{13}: checkout: moving from
854e79848c5531fce9017b415432c04033c1e208 to
09a65e0b5bdd7c3639e30bb4bbf9699c4700627f
854e798
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch tmp a873309
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch -av
* anrom-4.0
612952f fix destory activity
save downloadinfo sttus
tmp
a873309 add new functions to
install packages in different zone
remotes/anrom/anrom-4.0 612952f fix destory
activity save downloadinfo sttus
remotes/m/anrom-4.0
-> anrom/anrom-4.0
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git checkout
tmp
切换到分支 'tmp'
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git remote -v
anrom http://anrom.ancode.org:81/p/anrom/packages/apps/AnromMarket (fetch)
anrom http://anrom.ancode.org:81/p/anrom/packages/apps/AnromMarket (push)
point
ssh://chris@anrom.ancode.org:29418/anrom/packages/apps/AnromMarket.git
(fetch)
point
ssh://chris@anrom.ancode.org:29418/anrom/packages/apps/AnromMarket.git
(push)
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git log
commit a873309d7579ccceff13a1881bbc23740d62fe83
Author: Chris King
Date: Fri Jan 30 18:26:38 2015 +0800
add new functions to
install packages in different zone
Change-Id:
If42919eebd83723f8b3bff54a715c5ec2d49eb5a
commit 612952fbfad9e480d5cd3486034399644393c253
Author: NancyZhang <1049754324@qq.com>
Date: Tue Dec 30 10:43:14 2014 +0800
fix destory activity
save downloadinfo sttus
commit f896caf32faac0ae6b704ee70646879d7cd2d152
Author: NancyZhang <1049754324@qq.com>
Date: Mon Dec 29 18:04:01 2014 +0800
delete xx.apk
redownload
commit 8ca02a2fb9d3d620bd3efd35ac847e30a95b781a
Author: HackerOO7
Date: Fri Dec 26 21:35:21 2014 +0800
market: fix failed
intall issue
Change-Id:
If81c6a31232c6f7c76be220006f58477162dc121
commit 41386f310524984e76ab91fda1ab9d0dfde8f6f4
Merge: b999290 014eccd
Author: xq
Date: Fri Dec 26 19:55:19 2014 +0800
Merge "fix 3" into
anrom-4.0
commit b999290941abc89dc018fd6863df9c49cd2de022
Merge: 69c5bdc f2e753d
Author: xq
Date: Fri Dec 26 19:55:11 2014 +0800
Merge "fix err 2" into
anrom-4.0
commit 014eccd3541bf0556421db4e089eb4cc6a4e1360
Author: NancyZhang <1049754324@qq.com>
Date: Fri Dec 26 19:47:54 2014 +0800
fix 3
commit f2e753dd7514f867f1fffbbd42e4bcff688050e0
Author: NancyZhang <1049754324@qq.com>
Date: Fri Dec 26 19:42:53 2014 +0800
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$ git
branch -av
anrom-4.0
612952f
fix destory activity save downloadinfo sttus
* tmp
a873309 add new functions to install packages in
different zone
remotes/anrom/anrom-4.0 612952f fix destory
activity save downloadinfo sttus
remotes/m/anrom-4.0
-> anrom/anrom-4.0
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git checkout
anrom-4.0
切换到分支 'anrom-4.0'
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git cherry-pick
a873309d7579ccceff13a1881bbc23740d62fe83
[anrom-4.0 bf79eec] add new functions to install packages in
different zone
6 个文件被修改,插入 390 行(+),删除 194 行(-)
create mode 100644
src/org/ancode/anrommarket/InstallTask.java
create mode 100644
src/org/ancode/anrommarket/Installer.java
create mode 100644
src/org/ancode/anrommarket/PackageInstallObserver.java
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch -D
tmp
已删除 分支 tmp(曾为 a873309)
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch -av
* anrom-4.0
bf79eec add new functions to
install packages in different zone
remotes/anrom/anrom-4.0 612952f fix destory
activity save downloadinfo sttus
remotes/m/anrom-4.0
-> anrom/anrom-4.0
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git status
# 位于分支 anrom-4.0
无须提交(干净的工作区)
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git push point
HEAD:refs/for/anrom-4.0
Counting objects: 22, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (13/13), 5.36 KiB, done.
Total 13 (delta 6), reused 0 (delta 0)
remote: Resolving deltas: 100% (6/6)
remote: Processing changes: new: 1, refs: 1, done
remote:
remote: New Changes:
remote: http://anrom.ancode.org:81/4818 remote:
To
ssh://chris@anrom.ancode.org:29418/anrom/packages/apps/AnromMarket.git
* [new branch]
HEAD ->
refs/for/anrom-4.0
sync,就discarding
commits了。。。悲劇啊。。。還好補救回來了,引以為戒,以後一定要先checkout到分支上再修改
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git reflog
612952f HEAD@{0}: checkout: moving from
612952fbfad9e480d5cd3486034399644393c253 to anrom-4.0
612952f HEAD@{1}: checkout: moving from
a873309d7579ccceff13a1881bbc23740d62fe83 to
612952fbfad9e480d5cd3486034399644393c253
a873309 HEAD@{2}: commit: add new
functions to install packages in different zone
--這一條就是差點丟失的commit,編號a873309
612952f HEAD@{3}: merge
612952fbfad9e480d5cd3486034399644393c253: Fast-forward
8ca02a2 HEAD@{4}: merge
8ca02a2fb9d3d620bd3efd35ac847e30a95b781a: Fast-forward
a444826 HEAD@{5}: merge
a444826db727abdebddc8dc05d95881d3c050c99: Fast-forward
9b6baa2 HEAD@{6}: merge
9b6baa23b6b9207208ab7f6ca2bddb415c3f2db1: Fast-forward
8ef34c7 HEAD@{7}: merge
8ef34c751858793b4550149f541bde54073755be: Fast-forward
4cb7a72 HEAD@{8}: merge
4cb7a724f46c8d811b6cca031909def2f4d82bf1: Fast-forward
bf9fedc HEAD@{9}: checkout: moving from
2f807712c5a375871723a6b4edf818ff83855ef9 to
bf9fedce275469e2f4ff31d60080026afac68f72
2f80771 HEAD@{10}: checkout: moving from
90315aec1eacc95aba87d9c964d6f21407f0486f to
2f807712c5a375871723a6b4edf818ff83855ef9
90315ae HEAD@{11}: checkout: moving from
0acf66000a4b10a667ddf840ef27ab33822d19ed to
90315aec1eacc95aba87d9c964d6f21407f0486f
0acf660 HEAD@{12}: checkout: moving from
09a65e0b5bdd7c3639e30bb4bbf9699c4700627f to
0acf66000a4b10a667ddf840ef27ab33822d19ed
09a65e0 HEAD@{13}: checkout: moving from
854e79848c5531fce9017b415432c04033c1e208 to
09a65e0b5bdd7c3639e30bb4bbf9699c4700627f
854e798
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch tmp a873309
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch -av
* anrom-4.0
612952f fix destory activity
save downloadinfo sttus
tmp
a873309 add new functions to
install packages in different zone
remotes/anrom/anrom-4.0 612952f fix destory
activity save downloadinfo sttus
remotes/m/anrom-4.0
-> anrom/anrom-4.0
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git checkout
tmp
切换到分支 'tmp'
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git remote -v
anrom http://anrom.ancode.org:81/p/anrom/packages/apps/AnromMarket (fetch)
anrom http://anrom.ancode.org:81/p/anrom/packages/apps/AnromMarket (push)
point
ssh://chris@anrom.ancode.org:29418/anrom/packages/apps/AnromMarket.git
(fetch)
point
ssh://chris@anrom.ancode.org:29418/anrom/packages/apps/AnromMarket.git
(push)
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git log
commit a873309d7579ccceff13a1881bbc23740d62fe83
Author: Chris King
Date: Fri Jan 30 18:26:38 2015 +0800
add new functions to
install packages in different zone
Change-Id:
If42919eebd83723f8b3bff54a715c5ec2d49eb5a
commit 612952fbfad9e480d5cd3486034399644393c253
Author: NancyZhang <1049754324@qq.com>
Date: Tue Dec 30 10:43:14 2014 +0800
fix destory activity
save downloadinfo sttus
commit f896caf32faac0ae6b704ee70646879d7cd2d152
Author: NancyZhang <1049754324@qq.com>
Date: Mon Dec 29 18:04:01 2014 +0800
delete xx.apk
redownload
commit 8ca02a2fb9d3d620bd3efd35ac847e30a95b781a
Author: HackerOO7
Date: Fri Dec 26 21:35:21 2014 +0800
market: fix failed
intall issue
Change-Id:
If81c6a31232c6f7c76be220006f58477162dc121
commit 41386f310524984e76ab91fda1ab9d0dfde8f6f4
Merge: b999290 014eccd
Author: xq
Date: Fri Dec 26 19:55:19 2014 +0800
Merge "fix 3" into
anrom-4.0
commit b999290941abc89dc018fd6863df9c49cd2de022
Merge: 69c5bdc f2e753d
Author: xq
Date: Fri Dec 26 19:55:11 2014 +0800
Merge "fix err 2" into
anrom-4.0
commit 014eccd3541bf0556421db4e089eb4cc6a4e1360
Author: NancyZhang <1049754324@qq.com>
Date: Fri Dec 26 19:47:54 2014 +0800
fix 3
commit f2e753dd7514f867f1fffbbd42e4bcff688050e0
Author: NancyZhang <1049754324@qq.com>
Date: Fri Dec 26 19:42:53 2014 +0800
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$ git
branch -av
anrom-4.0
612952f
fix destory activity save downloadinfo sttus
* tmp
a873309 add new functions to install packages in
different zone
remotes/anrom/anrom-4.0 612952f fix destory
activity save downloadinfo sttus
remotes/m/anrom-4.0
-> anrom/anrom-4.0
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git checkout
anrom-4.0
切换到分支 'anrom-4.0'
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git cherry-pick
a873309d7579ccceff13a1881bbc23740d62fe83
[anrom-4.0 bf79eec] add new functions to install packages in
different zone
6 个文件被修改,插入 390 行(+),删除 194 行(-)
create mode 100644
src/org/ancode/anrommarket/InstallTask.java
create mode 100644
src/org/ancode/anrommarket/Installer.java
create mode 100644
src/org/ancode/anrommarket/PackageInstallObserver.java
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch -D
tmp
已删除 分支 tmp(曾为 a873309)
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git branch -av
* anrom-4.0
bf79eec add new functions to
install packages in different zone
remotes/anrom/anrom-4.0 612952f fix destory
activity save downloadinfo sttus
remotes/m/anrom-4.0
-> anrom/anrom-4.0
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git status
# 位于分支 anrom-4.0
无须提交(干净的工作区)
jinwh@debian-chris:~/anrom-4.0/packages/apps/AnromMarket$
git push point
HEAD:refs/for/anrom-4.0
Counting objects: 22, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (13/13), 5.36 KiB, done.
Total 13 (delta 6), reused 0 (delta 0)
remote: Resolving deltas: 100% (6/6)
remote: Processing changes: new: 1, refs: 1, done
remote:
remote: New Changes:
remote: http://anrom.ancode.org:81/4818 remote:
To
ssh://chris@anrom.ancode.org:29418/anrom/packages/apps/AnromMarket.git
* [new branch]
HEAD ->
refs/for/anrom-4.0
相关文章推荐
- 一個編譯小錯誤和解決方法 &n…
- 爲android添加一個新的底層service…
- 解决冲突
- Android_APP规范要点
- merge分支的方法
- 如何彻底禁止手机连接usb,代码实…
- Python在vim中的高亮显示设置方法…
- 云之讯官方测试Demo音频版源码阅读(编辑)
- Redis与Memcached的区别
- 151202iOS使用NSMutableAttributedString 实现富文本(不同颜色字体、下划线等)
- vnc for mac
- POJ 1721 CARDS(置换)
- webpack练手项目之easySlide(三):commonChunks
- Bundle savedInstanceState的作用
- 一个关于多线程池任务配合的项目的总结
- VMware 11安装Mac OS X 10.10
- C++的动态库和静态库
- Android动画_ScaleAnimation
- 1036. Boys vs Girls (25)
- android输入法ImeOptions