git-merge(1) on Linux
The text 28264a242790, as Debian 6.0 (Squeeze) shipped it.
Join two or more development histories together
Flags it lists
-
--commit -
--ff -
--ff-only -
--log -
--no-commit -
--no-ff -
--no-log -
--no-rerere-autoupdate -
--no-squash -
--no-stat -
--no-summary -
--quiet -
--rerere-autoupdate -
--squash -
--stat -
--strategy -
--strategy-option -
--summary -
--verbose -
-X -
-m -
-n -
-q -
-s -
-v