summaryrefslogtreecommitdiff
path: root/string-list.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-19 10:49:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-19 10:49:05 -0700
commit541b9cf1463334b1984a0b78a7180246415cb477 (patch)
treedca0ebe9f75365e4b35ea44488dca0010afd0496 /string-list.h
parentMerge branch 'bk/submodule-in-recursive-merge' (diff)
parentMerge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... (diff)
downloadtgif-541b9cf1463334b1984a0b78a7180246415cb477.tar.xz
Merge branch 'js/no-cherry-pick-head-after-punted'
* js/no-cherry-pick-head-after-punted: cherry-pick: do not give irrelevant advice when cherry-pick punted revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
Diffstat (limited to 'string-list.h')
0 files changed, 0 insertions, 0 deletions