summaryrefslogtreecommitdiff
path: root/sha1-lookup.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 12:56:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 12:56:35 -0700
commitb52ab19d91015ebd6bebc83a82b2c3d64b948b36 (patch)
tree56c03a113b6d6e5597f3e73ece62879c6268da45 /sha1-lookup.h
parentstring-list: document that string_list_insert() inserts unique strings (diff)
parentmerge: backport GIT_MERGE_AUTOEDIT support (diff)
downloadtgif-b52ab19d91015ebd6bebc83a82b2c3d64b948b36.tar.xz
Merge branch 'jc/maint-merge-autoedit' into maint
* jc/maint-merge-autoedit: merge: backport GIT_MERGE_AUTOEDIT support
Diffstat (limited to 'sha1-lookup.h')
0 files changed, 0 insertions, 0 deletions