aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-08 16:26:45 -0800
committerJunio C Hamano <gitster@pobox.com>2011-11-08 16:26:45 -0800
commit992499d8532c107f0f77163de4376ed2e0fd05a0 (patch)
treec3d76df03fd797fa1c1866b270db7a5b01601f08 /git-gui/lib/merge.tcl
parentfcbebfdd33bf8b6cc802300f81089148d413eec9 (diff)
parent38d4debb6d180ca53fcb12b8115e81fd4c5262d0 (diff)
downloadgit-992499d8532c107f0f77163de4376ed2e0fd05a0.tar.gz
git-992499d8532c107f0f77163de4376ed2e0fd05a0.tar.xz
Merge branch 'dm/pack-objects-update' into maint
* dm/pack-objects-update: pack-objects: don't traverse objects unnecessarily pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: use unsigned int for counter and offset values pack-objects: mark add_to_write_order() as inline
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions