summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-10 14:08:02 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-10 14:08:02 -0800
commitfd6abd0c65b38897da64ef883ed1934d2b2b1a3a (patch)
tree8c787e5034449bda1dfd0ad5c4d1c17128354d3e /commit.h
parentd88698ec0b4b91e61b0fe3e00d7451abcdf4cd44 (diff)
parentb5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773 (diff)
downloadgit-fd6abd0c65b38897da64ef883ed1934d2b2b1a3a.tar.gz
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'
* jc/merge-ff-only-stronger-than-signed-merge: merge: do not create a signed tag merge under --ff-only option
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions