summaryrefslogtreecommitdiff
path: root/unicode_width.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-27 15:14:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-27 15:14:21 -0700
commit3dcacd7797082cb8e6f3c10970e18dd843433e3a (patch)
tree5dce98361218d7d04b7d3cced3170fb14e5cca63 /unicode_width.h
parentMerge branch 'cc/replace-graft' (diff)
parentrebase: omit patch-identical commits with --fork-point (diff)
downloadtgif-3dcacd7797082cb8e6f3c10970e18dd843433e3a.tar.xz
Merge branch 'jk/rebase-am-fork-point'
"git rebase --fork-point" did not filter out patch-identical commits correctly. * jk/rebase-am-fork-point: rebase: omit patch-identical commits with --fork-point rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
Diffstat (limited to 'unicode_width.h')
0 files changed, 0 insertions, 0 deletions