Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:32:55 +0000 (10:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:32:55 +0000 (10:32 -0700)
commit0584326...5bba2e0b282725865437fbd57ddfa02e
treee4642c2...2ed39e4da46faddfd8c37164503726f9copy hash to clipboard (tree)
parent50bf38a...23957c31ae6f24c537e89fc16f1f5e30copy hash to clipboard (diff)
parentdabba59...aa0e94a8deb6f0e827144697895bcfe8copy hash to clipboard (diff)