Comments on: Note to self: comparing two branches in git and squashing several commits into one http://www.3hv.co.uk/blog/2009/06/02/note-to-self-comparing-two-branches-in-git-and-squashing-several-commits-into-one/ beautiful code for elegant web sites Mon, 23 Nov 2009 16:19:58 +0000 http://wordpress.org/?v=2.8.6 hourly 1 By: Caius http://www.3hv.co.uk/blog/2009/06/02/note-to-self-comparing-two-branches-in-git-and-squashing-several-commits-into-one/comment-page-1/#comment-1388 Caius Wed, 03 Jun 2009 18:12:03 +0000 http://www.3hv.co.uk/blog/?p=548#comment-1388 You can also miss out the current branch when using the <code>..</code> notation. <code>..master</code> is the equivalent of <code>HEAD..master</code> and vice versa. So if I'm on branch <em>foo</em> and want to diff against <em>master</em> I can just use <code>git diff master..</code> You can also miss out the current branch when using the .. notation. ..master is the equivalent of HEAD..master and vice versa.

So if I’m on branch foo and want to diff against master I can just use git diff master..

]]> By: Caius http://www.3hv.co.uk/blog/2009/06/02/note-to-self-comparing-two-branches-in-git-and-squashing-several-commits-into-one/comment-page-1/#comment-1385 Caius Tue, 02 Jun 2009 20:58:53 +0000 http://www.3hv.co.uk/blog/?p=548#comment-1385 s/tv/the/ # stupid iPhone s/tv/the/ # stupid iPhone

]]> By: Caius http://www.3hv.co.uk/blog/2009/06/02/note-to-self-comparing-two-branches-in-git-and-squashing-several-commits-into-one/comment-page-1/#comment-1384 Caius Tue, 02 Jun 2009 20:36:02 +0000 http://www.3hv.co.uk/blog/?p=548#comment-1384 When editing tv squash commit message I usually prepend all the commit messages with '* ' which is markdown or textile for a list. Looks pretty enough in plaintext, but even better when your bug tracker parses it into HTML. When editing tv squash commit message I usually prepend all the commit messages with ‘* ‘ which is markdown or textile for a list.

Looks pretty enough in plaintext, but even better when your bug tracker parses it into HTML.

]]>