projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 58e0362 2ce406c)
Merge branch 'jc/merge-bases'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:55:05 +0000 (12:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:55:05 +0000 (12:55 -0800)
commit098501527f2b5628f086d3d9d2fda87220c069a5
treed5874ea1c3185a6baa71719ff20e89ad57e53b46tree | snapshot
parent58e0362eddba1678a71c8990862053ff989527b6commit | diff
parent2ce406ccb85c4546b6d19309a6101b37c7bd952ecommit | diff
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 diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
builtin/rev-parse.c diff1 | diff2 | blob | history
commit.c diff1 | diff2 | blob | history
commit.h diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
notes-merge.c diff1 | diff2 | blob | history
revision.c diff1 | diff2 | blob | history
sha1_name.c diff1 | diff2 | blob | history
submodule.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.