Re: [git-users] Can not undo multiple git rebase using git reflog git reset --hard

2015-06-12 Thread Konrád Lőrinczi 
Thanks Rémi, you saved me a lot time.

I thought, if I do git reflog and it displays all changes I did, it will 
roll back through all changes  branches.

After your answer everything become clear.
However, I think the best implementation would be to work like I proposed 
to work.


Thanks very much!
Konrad





2015. június 10., szerda 17:04:44 UTC+2 időpontban Rémi Rampin a következőt 
írta:

 2015-06-09 15:55 GMT-04:00 Konrád Lőrinczi klor...@gmail.com 
 javascript::

 I did a few git rebase interactive between branches, but when I use git 
 reflog  git reset --hard HEAD@{N} I can not get the same branch hierarchy 
 as it was before.
 git reflog
 git reset --hard HEAD@{14}


 Hi,

 You seem to be confused as to what git reset --hard does -- it doesn't 
 reset your whole repository, it moves a single branch head to a different 
 commit.

 You will have to consult the reflog of each branch (git reflog local_dev), 
 and reset that branch to the correct point (git checkout local_dev; git 
 reset --hard local_dev@{N}).

 Good luck
 -- 
 Rémi Rampin


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Can not undo multiple git rebase using git reflog git reset --hard

2015-06-10 Thread Rémi Rampin 
2015-06-09 15:55 GMT-04:00 Konrád Lőrinczi klorin...@gmail.com:

 I did a few git rebase interactive between branches, but when I use git
 reflog  git reset --hard HEAD@{N} I can not get the same branch
 hierarchy as it was before.
 git reflog
 git reset --hard HEAD@{14}


Hi,

You seem to be confused as to what git reset --hard does -- it doesn't
reset your whole repository, it moves a single branch head to a different
commit.

You will have to consult the reflog of each branch (git reflog local_dev),
and reset that branch to the correct point (git checkout local_dev; git
reset --hard local_dev@{N}).

Good luck
-- 
Rémi Rampin

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Can not undo multiple git rebase using git reflog git reset --hard

2015-06-09 Thread Konrád Lőrinczi 
I did a few git rebase interactive between branches, but when I use git 
reflog  git reset --hard HEAD@{N} I can not get the same branch hierarchy 
as it was before.
git reflog
git reset --hard HEAD@{14}

Now all local_dev, local_dev_appuserimport-under_work, 
local_dev_app_import_merge-under_work have the same content, and are on the 
same level when viewing with Git Extensions.
It seems now after rebase interactive all changes are merged  kept as a 
single branch line.
And I can not undo it using rebase.


Any idea, how to restore previous state, when branches weren't rebased?


Here is the last 42 lines of reflog:
0da7c2e HEAD@{0}: checkout: moving from local_dev to 
local_dev_appuserimport-under_work
0da7c2e HEAD@{1}: reset: moving to HEAD@{12}
4a78f78 HEAD@{2}: reset: moving to HEAD@{12}
0da7c2e HEAD@{3}: checkout: moving from local_dev_appuserimport-under_work 
to local_dev
0da7c2e HEAD@{4}: rebase -i (finish): returning to 
refs/heads/local_dev_appuserimport-under_work
0da7c2e HEAD@{5}: rebase -i (start): checkout local_dev
d18a674 HEAD@{6}: checkout: moving from local_dev_app_fix-unfinished to 
local_dev_appuserimport-under_work
e8df23e HEAD@{7}: rebase -i (finish): returning to 
refs/heads/local_dev_app_fix-unfinished
e8df23e HEAD@{8}: rebase -i (pick): Intermediate state of debugging  
fixing. Unfinished.
0da7c2e HEAD@{9}: rebase -i (start): checkout local_dev
08784b5 HEAD@{10}: checkout: moving from 
local_dev_app_import_merge-under_work to local_dev_app_fix-unfinished
0da7c2e HEAD@{11}: rebase -i (finish): returning to 
refs/heads/local_dev_app_import_merge-under_work
0da7c2e HEAD@{12}: rebase -i (start): checkout local_dev
f1ec09f HEAD@{13}: checkout: moving from local_dev to 
local_dev_app_import_merge-under_work
0da7c2e HEAD@{14}: commit: Reset back to Live server state.
4a78f78 HEAD@{15}: checkout: moving from dev to local_dev
1bdac05 HEAD@{16}: commit: - Moved some code parts within the code to have 
logical left, center, right order.
03ab880 HEAD@{17}: checkout: moving from local_dev to dev
4a78f78 HEAD@{18}: commit: - changed back as it has multiple references in 
other files. Should be changed together in all files later.
f1ec09f HEAD@{19}: checkout: moving from 
local_dev_app_import_merge-under_work to local_dev
f1ec09f HEAD@{20}: checkout: moving from local_dev to 
local_dev_app_import_merge-under_work
f1ec09f HEAD@{21}: commit: Remove advanced_list change. Currently not used.
daac3b7 HEAD@{22}: checkout: moving from 
local_dev_app_import_merge-under_work to local_dev
daac3b7 HEAD@{23}: checkout: moving from local_dev to 
local_dev_app_import_merge-under_work
daac3b7 HEAD@{24}: commit: The generated app names now get displayed the 
words in them, based on app code.
713d6ec HEAD@{25}: commit: Restore to DEV state before starting 
appuserimport module new feature development.
b26973c HEAD@{26}: checkout: moving from local_dev_appimport_v2-unfinished 
to local_dev
b26973c HEAD@{27}: checkout: moving from local_dev to 
local_dev_appimport_v2-unfinished
b26973c HEAD@{28}: checkout: moving from 
local_dev_app_import_development_files-unused to local_dev
2f2ae26 HEAD@{29}: checkout: moving from local_dev_appuserimport-under_work 
to local_dev_app_import_development_files-unused
d18a674 HEAD@{30}: commit: Reset some files to local_dev branch state.
1c52721 HEAD@{31}: commit: Reset some files to local_dev branch state.
b026379 HEAD@{32}: checkout: moving from local_dev to 
local_dev_appuserimport-under_work
b26973c HEAD@{33}: commit: Restore to DEV state before fixing app.
6e54677 HEAD@{34}: checkout: moving from local_dev_app_fix-unfinished to 
local_dev
08784b5 HEAD@{35}: checkout: moving from local_dev to 
local_dev_app_fix-unfinished
6e54677 HEAD@{36}: checkout: moving from local_dev_app_fix-unfinished to 
local_dev
08784b5 HEAD@{37}: commit: Intermediate state of debugging  fixing. 
Unfinished.
caa98a3 HEAD@{38}: commit: Save DEV state before fixing development.
6e54677 HEAD@{39}: checkout: moving from local_dev to 
local_dev_app_fix-unfinished
6e54677 HEAD@{40}: commit: Use current semester start date from live server.
2ed5e0c HEAD@{41}: checkout: moving from dev to local_dev



Thanks,
Konrad Lorinczi

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.