]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3984764 01a31f3)
Merge branch 'jk/verify-sig-merge-into-void'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:54 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:54 +0000 (18:23 +0900)
commit6d2035ee605980efa9915e10d35e7a355fc74077
tree5d33f09a10185d66398070e26bcaf864f55709bdtree | snapshot
parent39847644adb3678da91048b2ac6ebc2b3c475f3acommit | diff
parent01a31f3bcaae8b62e5e11ee12d7b1606700f0721commit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
builtin/pull.c diff1 | diff2 | blob | history
commit.c diff1 | diff2 | blob | history
commit.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.