Re: [psas-avionics] Git basics tutorial

2013-02-21 Thread Josh Triplett
On Thu, Feb 21, 2013 at 08:33:38AM -0800, K Wilson wrote:
 At last Tuesday's meeting we had some people who wanted to get
 started working with PSAS firmware but did not have any experience
 with 'git' which is the version control system we use to manage
 and share our work.
 
 I think the link below is a nice place to start, with good
 explanations and additional chapters if you want to
 go beyond the basics.
 
 http://git-scm.com/book/en/Getting-Started-Git-Basics

You might also find this recent presentation from linux.conf.au helpful,
as well as entertaining:

http://mirror.linux.org.au/linux.conf.au/2013/mp4/Git_For_Ages_4_And_Up.mp4

- Josh Triplett

___
psas-avionics mailing list
psas-avionics@lists.psas.pdx.edu
http://lists.psas.pdx.edu/mailman/listinfo/psas-avionics


Re: [psas-avionics] git commit logs

2010-09-13 Thread Josh Triplett
On Mon, Sep 13, 2010 at 12:24:45AM -0700, Daniel Ferguson wrote:
 Yeah, wow. i'm doing great on the commit comments.I keep messing them up.
 two different times now. I could live with one, but now i've got two. the
 shame is overwhelming.
 
 what's the story on fixing bad commit comments?

If you haven't already pushed it, and you haven't committed anything
else on top of it, just git commit --amend.

If you haven't already pushed it, but you've already committed more on
top of it, try git rebase -i thatcommit^ , and then you can choose to
reword or edit the comit.

If you've already pushed it, then better luck next commit. :)

- Josh Triplett

___
psas-avionics mailing list
psas-avionics@lists.psas.pdx.edu
http://lists.psas.pdx.edu/mailman/listinfo/psas-avionics