summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-07 15:40:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-07 15:40:21 -0800
commit3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33 (patch)
tree4e39d2295155392349986d5ae49fa6506e960560 /contrib/emacs
parentMerge branch 'mg/tag-d-show' (diff)
parentoctopus: remove dead code (diff)
downloadtgif-3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33.tar.xz
Merge branch 'sb/maint-octopus'
* sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow Conflicts: git-merge-octopus.sh
Diffstat (limited to 'contrib/emacs')
0 files changed, 0 insertions, 0 deletions