[csw-maintainers] [offtopic] git presentation

[Maciej Bliziński]

2011/8/16 Ben Walton <bwalton at opencsw.org>:
> What features do you:
>
> find most useful?

1. git stage -p
2. Rebasing.  It took me a long time to get what it does and why is it
useful. Also, history rewriting in general.

In simpler terms: I find it especially useful to do this:

- Work on feature1 and send it for code review (I don't commit it yet)
- While feature1 is under review, work on feature2 which depends on feature1

After completing feature1, I can create a set of patches for feature2,
while keeping the history linear.

> find hardest to understand?

git reset vs git reset --hard, how one doesn't modify the sources and
the other does. I consider the words "reset" and "hard" misnomers.

> wish you'd learned earlier?

Git's internal data structures.

> find most dangerous?

Using git-svn.  E.g. you read [1] and you think "cool! I will now use
all of git features! I will be able to move code between hosts using
git and then commit to subversion!" And then you try it, and you see
the self-resurrecting code conflicts. After half a year, you arrive at
[2].

[1] http://andy.delcambre.com/2008/03/04/git-svn-workflow.html
[2] http://automatthias.wordpress.com/2011/03/28/a-git-svn-workflow/