Re: [Flightgear-devel] git for dummies

[Curtis O. <cur...@gm...>]

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

Curt.


On Tue, Jan 4, 2011 at 2:24 PM, Tim Moore wrote:

>
>
> On Tue, Jan 4, 2011 at 5:36 PM, Curtis Olson wrote:
>
>> I have a git question.
>>
>> I'm trying to "git push" a new joystick config someone sent me.  When I
>> run git push I get the following message:
>>
>> $ git push
>> To gi...@gi...:fg/fgdata.git
>>  ! [rejected]        master -> master (non-fast-forward)
>> error: failed to push some refs to 'gi...@gi...:fg/fgdata.git'
>> To prevent you from losing history, non-fast-forward updates were rejected
>> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
>> 'Note about fast-forwards' section of 'git push --help' for details.
>>
>>
>> Make sense, so next I run "git pull" and get the following message:
>>
>> $ git pull
>> remote: Counting objects: 31, done.
>> remote: Compressing objects: 100% (17/17), done.
>> remote: Total 17 (delta 13), reused 0 (delta 0)
>> Unpacking objects: 100% (17/17), done.
>> From gitorious.org:fg/fgdata
>>    aaef799..4affc2c  master     -> origin/master
>> error: Your local changes to 'Aircraft/f-14b/Nasal/SAS.nas' would be
>> overwritten by merge.  Aborting.
>> Please, commit your changes or stash them before you can merge.
>>
>>
>> Ok, I remember tweaking the file Aircraft/f-14b/Nasal/SAS.nas a few weeks
>> ago, and in the mean time I've done a "git stash" and "git stash apply" to
>> get around this problem before.  I could probably do it again.
>>
>> But here's my question.  Now that I've done the git stash and git stash
>> apply commands, when I run git diff, I don't see my local differences.  Is a
>> git stash apply similar to a git commit in that it actually commits my local
>> edits to my local repository.
>>
>> No. "git stash" is sort of like a commit + a reset to the previous commit.
> "git stash apply" and "git stash pop" are like applying a patch.
>
>  A simple thing you can do is "git status", which tells you git's idea of
> the modified files in your working tree.
>
>
>> When I'm just fiddling around, I'd prefer some times to just carry my
>> edits forward as non-committed edits so it's easy to see what I've fiddled
>> with and can clean things up if I no longer need or want my local tweaks.
>>
>> What's the best way now to see what my local changes are after doing a git
>> stash apply?  What is the best way to carry local experimental edits forward
>> while I'm still experimenting and aren't sure if I want to keep them?
>>
>> As everyone else has said, commit 'em in a branch.
>
>> Please explain in simple language. :-)
>>
> Tim
>
>
> ------------------------------------------------------------------------------
> Learn how Oracle Real Application Clusters (RAC) One Node allows customers
> to consolidate database storage, standardize their database environment,
> and,
> should the need arise, upgrade to a full multi-node Oracle RAC database
> without downtime or disruption
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________
> Flightgear-devel mailing list
> Fli...@li...
> https://lists.sourceforge.net/lists/listinfo/flightgear-devel
>
>


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