summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-28 13:25:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-28 13:25:57 -0800
commit524ee675a36961c5b59302e84ffd08808f4f787e (patch)
treed64fc7d9b88c9be517e87fdf82f8a3fb31ee5f01 /sequencer.c
parentMerge branch 'maint' (diff)
parentAdd a setting to require a filter to be successful (diff)
downloadtgif-524ee675a36961c5b59302e84ffd08808f4f787e.tar.xz
Merge branch 'jb/required-filter'
* jb/required-filter: Add a setting to require a filter to be successful Conflicts: convert.c
Diffstat (limited to 'sequencer.c')
0 files changed, 0 insertions, 0 deletions