git-merge(1) on Linux
The text b97a3abb46b1, as Debian 5.0 (Lenny) shipped it.
Join two or more development histories together
Flags it lists
-
--commit -
--ff -
--log -
--no-commit -
--no-ff -
--no-log -
--no-squash -
--no-stat -
--no-summary -
--squash -
--stat -
--strategy -
--summary -
-m -
-n -
-s