summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:36:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:36:12 -0700
commit9a86b899415c8a49cc33d6b43bcab8113ddca517 (patch)
tree75c5c99594fc6d20d6196860aa78cd46c733ea16 /mergetools/gvimdiff2
parentMerge branch 'nr/git-cd-to-a-directory' (diff)
parentupdate-ref: add test cases covering --stdin signature (diff)
downloadtgif-9a86b899415c8a49cc33d6b43bcab8113ddca517.tar.xz
Merge branch 'bk/refs-multi-update'
Give "update-refs" a "--stdin" option to read multiple update requests and perform them in an all-or-none fashion. * bk/refs-multi-update: update-ref: add test cases covering --stdin signature update-ref: support multiple simultaneous updates refs: add update_refs for multiple simultaneous updates refs: add function to repack without multiple refs refs: factor delete_ref loose ref step into a helper refs: factor update_ref steps into helpers refs: report ref type from lock_any_ref_for_update reset: rename update_refs to reset_refs
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions