summaryrefslogtreecommitdiff
path: root/utf8.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-02-13 13:38:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-13 13:38:59 -0800
commit2cd861672e1021012f40597b9b68cc3a9af62e10 (patch)
tree5638bb031b32cb06df4ec87ff8066c2ca48cd7c9 /utf8.c
parentMerge branch 'jc/revision-range-unpeel' into maint (diff)
parentmerge-base --octopus: reduce the result from get_octopus_merge_bases() (diff)
downloadtgif-2cd861672e1021012f40597b9b68cc3a9af62e10.tar.xz
Merge branch 'bm/merge-base-octopus-dedup' into maint
"git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * bm/merge-base-octopus-dedup: merge-base --octopus: reduce the result from get_octopus_merge_bases() merge-base: separate "--independent" codepath into its own helper
Diffstat (limited to 'utf8.c')
0 files changed, 0 insertions, 0 deletions