Merge branch 'en/rerere-multi-stage-1-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000 (10:30 -0700)
commitbd3941a...aed0756aba43f504d0dea7a3fbe0c82b
tree17d9c22...6491f77904aa727ccfc833c9150d441bcopy hash to clipboard (tree)
parente3d4ff0...7db41234eaf74167ab7d1a443c23243dcopy hash to clipboard (diff)
parentad2bf0d...b43433583e88128c278ce31c7ca4e431copy hash to clipboard (diff)
rerere.c
t/t4200-rerere.sh