Merge branch 'js/am-3-merge-recursive-direct'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:20 +0000 (12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:20 +0000 (12:33 -0700)
commit1a5f1a3...256a53014e5b832e1281d952ec5f9ef7
tree90cdcd9...d55b8970bd127078415b26f76524aa11copy hash to clipboard (tree)
parent7a3ea66...331cd6cf8d9a7a15aafc33459b8c571ccopy hash to clipboard (diff)
parent6999bc7...74c2a8d7605c3ad24bd4e5371a6df71ccopy hash to clipboard (diff)
builtin/am.c
grep.c
sequencer.c
sha1_file.c
transport.c
wt-status.c