Re: [git-users] How do you switch head location without changing files?

2015-05-11 Thread Michael
Thank you!

On 2015-05-10, at 5:49 PM, Dale R. Worley  wrote:

> Michael  writes:
> 
>> Lets say you've got files set up to commit to one point in the tree,
>> but you're actually in a different location. How do you move where you
>> are / where a commit will go, without altering the files?
> 
> git reset --soft 
> 
> looks like the command that does what you want.
> 
> Dale
> 
> -- 
> 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.

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
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] How do you switch head location without changing files?

2015-05-10 Thread Dale R. Worley
Michael  writes:

> Lets say you've got files set up to commit to one point in the tree,
> but you're actually in a different location. How do you move where you
> are / where a commit will go, without altering the files?

git reset --soft 

looks like the command that does what you want.

Dale

-- 
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] How do you switch head location without changing files?

2015-05-09 Thread Michael
Lets say you've got files set up to commit to one point in the tree, but you're 
actually in a different location. How do you move where you are / where a 
commit will go, without altering the files?

How did I get here?

  714  git checkout 4194
  715  git tag -a baseChest -m "Branch here for merge"
  716  git checkout chest chest_content.cfg 
-- fetched a commit that had half of the changes to the configs
-- Used git gui to unstage one chunk known to cause problems
-- Attempted to commit (from git gui), only to be told I was in detached head.
  717  git checkout chest
-- Attempted to switch to where I wanted this edit to go.
-- Told that my edits would be overwritten
  718  man git checkout
  719  man git-checkout
  720  man git-add
  721  man git-checkout
  722  git checkout -p chest
-- I thought this would give me an interactive mode to let me say that my edits 
would be kept.
-- It did not.
  723  git status
  724  git checkout chest
-- Still won't let me get there to save my changes
  725  man git-branch
  726  man git-checkout
-- and I'm clueless here.

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
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.