summaryrefslogtreecommitdiff
path: root/sha1-array.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 10:28:30 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-22 10:28:30 -0700
commit5796c5baa3ef0a7d179fdac6cb5815f75f65fd53 (patch)
tree1df36d2be4b34422fc7db95cbd8934278b4acb78 /sha1-array.h
parent1a1f7b2c522814a251b77cb7dd7b0ee2e7410f88 (diff)
parent79bc4ef3686bc6795aa79a1d4aa6d3060a2cbd93 (diff)
downloadgit-5796c5baa3ef0a7d179fdac6cb5815f75f65fd53.tar.gz
Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint
* cb/filter-branch-prune-empty-degenerate-merges: filter-branch: eliminate duplicate mapped parents
Diffstat (limited to 'sha1-array.h')
0 files changed, 0 insertions, 0 deletions