On Tue, Jan 4, 2011 at 2:44 PM, Curtis Olson wrote:
> Ok, thanks for all the advice. "git diff --cached" did show me my actual
> change that "git diff" had lost. I doubt I'll remember that next time I
> need it. So I'll look at making changes to a branch in the future. At the
> moment I'm just trying to unwind my current tree. Apologies if I screw
> something up in the process ...
Ok, I'm ready for some more hand holding with git. :-)
Following the advice of the experts, I have created my own local branch of
"flightgear" by cd'ing to the flightgear source tree and running:
git branch mystuff
It appears that the local changes I had made to the "next" branch were
automatically migrated to the new "mystuff" branch.
I can run "git checkout mystuff" and then run "git branch" and my new branch
is listed with a star (*) next to it, which means it was actually created
and now it is the current branch. (Correct?)
I can now run "git checkout next" to get back to the "head" if that is the
right term in git. And I can run "git checkout mystuff" to return to my
local branch.
Now questions:
- What is the best way to clean up my "next" branch of all the changes I had
previously made before I created my own branch? I'd like to return it to
it's pristine untouched state now that I have a local branch for my local
changes.
- What is the best way now to keep my "next" branch current with upstream
changes?
- What is the best way to keep my "mystuff" branch current and merge
upstream changes back to my local branch while preserving my local changes
and possibly carrying any uncommitted tweaks forward as uncommitted tweaks?
Thanks,
Curt.
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org -
http://www.flightgear.org/blogs/category/curt/<http://www.flightgear.org/blogs/category/personal/curt/>
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
