summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-19 14:41:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-19 14:41:29 -0700
commitf9610bcae907a38636174a688c1aa89c63cc9c1a (patch)
tree42916e48c15f4523b684532aa1634f61a3720f9f /git-pull.sh
parentMerge branch 'ib/scripted-parse-opt-better-hint-string' into maint (diff)
parentfast-import: do less work when given "from" matches current branch head (diff)
downloadtgif-f9610bcae907a38636174a688c1aa89c63cc9c1a.tar.xz
Merge branch 'mh/fast-import-optimize-current-from' into maint
Often a fast-import stream builds a new commit on top of the previous commit it built, and it often unconditionally emits a "from" command to specify the first parent, which can be omitted in such a case. This caused fast-import to forget the tree of the previous commit and then re-read it from scratch, which was inefficient. Optimize for this common case. * mh/fast-import-optimize-current-from: fast-import: do less work when given "from" matches current branch head
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions