Reintegrate: handle merging from remote tracking branches
commitdc8b63cc1211cc5b86126b49bcba29340027823b
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 19:12:42 +0000 (10 11:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Jan 2010 19:12:42 +0000 (10 11:12 -0800)
treeab52650ab9b9e66842bfb04a57b72b39d62cae55
parent07635fa6ffa2b16893f437274fd8f4415b65ec4d
Reintegrate: handle merging from remote tracking branches
Reintegrate