diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-13 19:42:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 19:42:11 (GMT) |
| commit | 5a62b531ae1fda10d023082cb73a5440dbd54df1 (patch) | |
| tree | 42895bf2539d5bf3ed6e17936d19679ffd2a9f6c /git-sh-setup.sh | |
| parent | 8eb865ba8a24aad5380a23fc1e331aba2f7c5bbb (diff) | |
| parent | b5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773 (diff) | |
| download | git-5a62b531ae1fda10d023082cb73a5440dbd54df1.zip git-5a62b531ae1fda10d023082cb73a5440dbd54df1.tar.gz git-5a62b531ae1fda10d023082cb73a5440dbd54df1.tar.bz2 | |
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint
* jc/merge-ff-only-stronger-than-signed-merge:
merge: do not create a signed tag merge under --ff-only option
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions