commit | a94eda65d37149e81356b6a263ce03015d3f5d73 | [log] [tgz] |
---|---|---|
author | Robin Rosenberg <robin.rosenberg.lists@dewire.com> | Sat Sep 01 14:11:10 2007 +0200 |
committer | Junio C Hamano <gitster@pobox.com> | Sat Sep 01 10:36:56 2007 -0700 |
tree | d94c1c5de87aeb759be0ffccbf4decfe358b27f9 | |
parent | 947ad2e1de787deda69b40c7047436c37dc040c7 [diff] |
Mention -m as an abbreviation for --merge Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>