Lars Hjemli 5072a32382 Teach git-pull about --[no-]ff, --no-squash and --commit ...

These options are supported by git-merge, but git-pull didn't know about
them.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2007-10-29 13:32:52 -07:00

4.0 KiB

Executable File

Raw Blame History

View Raw