Merge branch 'cn/pull-rebase-message'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800)
commit4b4ec3fc6480312515e1ec3d827c1308c00adc1e
tree1706a0bb7bc9cd330ba65e446bd4272679d94342
parent2917e22496496dca8b42cf033ba3169c187c16fb
parent3c02396adc0d8836bccc4fbc95edbb3ca8c1f508
Merge branch 'cn/pull-rebase-message'

By Carlos Martín Nieto
* cn/pull-rebase-message:
  Make git-{pull,rebase} message without tracking information friendlier