summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:46:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:46:42 -0700
commit5734fa4608ada9c1df20ac27988715ee27b36613 (patch)
treee4a4d14a051ca510d076c834e454511f81e5e6fc /resolve-undo.h
parentMerge branch 'kb/co-orphan-suggestion-short-sha1' (diff)
parentcompletion: small optimization (diff)
downloadtgif-5734fa4608ada9c1df20ac27988715ee27b36613.tar.xz
Merge branch 'fc/completion'
In addition to a user visible change to offer more options to cherry-pick, generally cleans up and simplifies the code. * fc/completion: completion: small optimization completion: inline __gitcomp_1 to its sole callsite completion: get rid of compgen completion: add __gitcomp_nl tests completion: add new __gitcompadd helper completion: get rid of empty COMPREPLY assignments completion: trivial test improvement completion: add more cherry-pick options
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions