Merge branch 'jc/merge-bases'
commit098501527f2b5628f086d3d9d2fda87220c069a5
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:55:05 +0000 (7 12:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:55:05 +0000 (7 12:55 -0800)
treed5874ea1c3185a6baa71719ff20e89ad57e53b46
parent58e0362eddba1678a71c8990862053ff989527b6
parent2ce406ccb85c4546b6d19309a6101b37c7bd952e
Merge branch 'jc/merge-bases'

The get_merge_bases*() API was easy to misuse by careless
copy&paste coders, leaving object flags tainted in the commits that
needed to be traversed.

* jc/merge-bases:
  get_merge_bases(): always clean-up object flags
  bisect: clean flags after checking merge bases
bisect.c
builtin/merge.c
builtin/rev-parse.c
commit.c
commit.h
merge-recursive.c
notes-merge.c
revision.c
sha1_name.c
submodule.c