Merge branch 'jc/rerere-auto-more'
commitd1f2e1696ce168b3a70b59be7c58fa96c530d4fb
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:17 +0000 (20 18:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:17 +0000 (20 18:00 -0700)
tree7fc97231cfbef133726da4c20586ec4a64962ba6
parent245648dede5e67180ce059a71e3f77a8bb7f52b4
parent9196e825875dce66f6bc95dda01f5833f20bc5e5
Merge branch 'jc/rerere-auto-more'

* jc/rerere-auto-more:
  rerere.autoupdate: change the message when autoupdate is in effect