Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 17:56:39 +0000 (09:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 17:56:39 +0000 (09:56 -0800)
commit216d29e...257e48f95bc14765d5da17e7854a3109
tree7cd0e31...75f442d9ae146f222b102b9982bd60cecopy hash to clipboard (tree)
parentd52adf1...328162a9513940913ced044d24c0212fcopy hash to clipboard (diff)
parent261f315...ebfa9af2d09f20211960100ff06f87cbcopy hash to clipboard (diff)
Documentation/git-tag.txt
builtin/commit.c
builtin/merge.c
sequencer.c
sequencer.h