| commit | 9858b87fbb990659ea98f1bc77c2e0283cdcaa4a | |
| author | Björn Gustavsson <bgustavsson@gmail.com> | |
| Wed, 11 Nov 2009 04:49:07 +0000 (11 05:49 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 14 Nov 2009 23:34:37 +0000 (14 15:34 -0800) | ||
| tree | 7147b299f58772101dfc9a11e43d1da6c5d4bc26 | treesnapshot (tar.gz zip) |
| parent | d58f927c481646fc6c75b3bfc6368cb0096d074d | commitdiff |
bash: add the merge option --ff-only
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/completion/git-completion.bash | diffblobblamehistory |