How To GitHub: A Complete Guide to Forking, Branching, Squashing and Pulls

Re:How To GitHub: A Complete Guide to Forking, Branching, Sq... by vedang on Wednesday March 28, 2012 @09:02AM (#3765975)

`The golden rule is: rebase your own stuff all day long, as much as you want. Don't rebase once you've published.`

This is a great rule of thumb, which I have had to repeatedly drill into my team-mates. The crux of the problem, I've come to realise, is that people can't differentiate between a "local" commit and a "published" commit.

Git tutorials need to focus a bit more on the nature of git than on simply showing the basic operations.

[ Parent | on HN ]

Re:How To GitHub: A Complete Guide to Forking, Branching, Sq... by snprbob86 on Wednesday March 28, 2012 @03:02PM (#3767778)

Tell your team to add these aliases to their .gitconfig:

    [alias]
      l = log --oneline --decorate --graph
      la = log --oneline --decorate --graph --all

--online --graph : Will really help visual learners

--decorate : Makes it super obvious how labels and tags work

--all : Extends the usefulness of --decorate to branches and remotes

[ Parent | on HN ]