diff options
author | Björn Gustavsson <bgustavsson@gmail.com> | 2009-11-11 05:49:07 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-14 15:34:37 -0800 |
commit | 9858b87fbb990659ea98f1bc77c2e0283cdcaa4a (patch) | |
tree | 7147b299f58772101dfc9a11e43d1da6c5d4bc26 /t/t9151 | |
parent | Merge branch 'maint' (diff) | |
download | tgif-9858b87fbb990659ea98f1bc77c2e0283cdcaa4a.tar.xz |
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>
Diffstat (limited to 't/t9151')
0 files changed, 0 insertions, 0 deletions