Mention -m as an abbreviation for --merge
authorRobin Rosenberg <robin.rosenberg.lists@dewire.com>
Sat, 1 Sep 2007 12:11:10 +0000 (14:11 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Sep 2007 17:36:56 +0000 (10:36 -0700)
commita94eda65d37149e81356b6a263ce03015d3f5d73
treed94c1c5de87aeb759be0ffccbf4decfe358b27f9
parent947ad2e1de787deda69b40c7047436c37dc040c7
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>
Documentation/git-rebase.txt