Merge branch 'jh/notes-merge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:12 +0000 (11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:12 +0000 (11:24 -0800)
commit657072f...ac5519f146a947253c9959909b38c293
tree0c2cf3f...19816c8f0da1ec5216f38381a042f068copy hash to clipboard (tree)
parentf04aa35...b6117d99f5abf9630961b2c2651d3ed1copy hash to clipboard (diff)
parent35d2fff...b857836cc46f5a4ada525a246ddd5e11copy hash to clipboard (diff)
Documentation/git-merge.txt
Makefile
builtin.h
builtin/merge.c
builtin/notes.c
notes.c
notes.h
t/t3301-notes.sh
t/t3404-rebase-interactive.sh