| commit | 6d2035ee605980efa9915e10d35e7a355fc74077 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Nov 2018 09:23:54 +0000 (18 18:23 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Nov 2018 09:23:54 +0000 (18 18:23 +0900) | ||
| tree | 5d33f09a10185d66398070e26bcaf864f55709bd | treesnapshot (tar.gz zip) |
| parent | 39847644adb3678da91048b2ac6ebc2b3c475f3a | commitdiff |
| parent | 01a31f3bcaae8b62e5e11ee12d7b1606700f0721 | commitdiff |
Merge branch 'jk/verify-sig-merge-into-void'
"git merge" and "git pull" that merges into an unborn branch used
to completely ignore "--verify-signatures", which has been
corrected.
* jk/verify-sig-merge-into-void:
pull: handle --verify-signatures for unborn branch
merge: handle --verify-signatures for unborn branch
merge: extract verify_merge_signature() helper
"git merge" and "git pull" that merges into an unborn branch used
to completely ignore "--verify-signatures", which has been
corrected.
* jk/verify-sig-merge-into-void:
pull: handle --verify-signatures for unborn branch
merge: handle --verify-signatures for unborn branch
merge: extract verify_merge_signature() helper
| builtin/merge.c | diff1 | diff2 | blobhistory |
| builtin/pull.c | diff1 | diff2 | blobhistory |
| commit.c | diff1 | diff2 | blobhistory |
| commit.h | diff1 | diff2 | blobhistory |