summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorLibravatar Adrian Weimann <adrian.weimann@googlemail.com>2012-01-30 20:29:33 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-06 00:00:54 -0800
commit2ff14e31bd8c91356d54b7bac064e7cc615e56b3 (patch)
tree30f70c3c763ca031e1856cdf2c9c0ab336336292 /advice.h
parentMerge branch 'sp/smart-http-failure-to-push' into maint (diff)
downloadtgif-2ff14e31bd8c91356d54b7bac064e7cc615e56b3.tar.xz
completion: --edit and --no-edit for git-merge
Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.h')
0 files changed, 0 insertions, 0 deletions