diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:54 +0900 |
| commit | 6d2035ee605980efa9915e10d35e7a355fc74077 (patch) | |
| tree | 5d33f09a10185d66398070e26bcaf864f55709bd /rerere.c | |
| parent | Merge branch 'js/mingw-res-rebuild' (diff) | |
| parent | pull: handle --verify-signatures for unborn branch (diff) | |
| download | tgif-6d2035ee605980efa9915e10d35e7a355fc74077.tar.xz | |
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
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions