libftdi Archives

Subject: RE: libftdi-1.0: More patches

From: "Michael Plante" <michael.plante@xxxxxxxxx>
To: <libftdi@xxxxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 5 Sep 2011 14:27:20 -0400
Uwe Bonnes wrote:
>> B.t.w. how do I switch a tree like
>> > git status
>> # On branch master
>> # Your branch is ahead of 'origin/master' by 1 commit.
>>
>> to new-baudrate-code and later back?
>> My reference for git is
>> http://wiki.winehq.org/GitWine
>> but I see no example there.


If your working copy is clean, you can:

$ git checkout new-baudrate-code

$ # do stuff

$ git checkout master



If your working copy is not clean, you can stash your changes:

$ git status
# shows modified files...

$ git stash save

$ git checkout new-baudrate-code

$ git checkout master

$ git stash list
# shows a reflog for stash, like stash@{0}

$ git stash pop
# pops the stack (compare with git stash apply)

(This is from memory, so I can't show the output.  It should be correct,
though.)


You might look at more official information:

http://www.kernel.org/pub/software/scm/git/docs/user-manual.html

http://git-scm.com/documentation

HTH,
Michael


--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx   

Current Thread