summaryrefslogtreecommitdiff
path: root/git-filter-branch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-07 23:40:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-07 23:40:21 (GMT)
commit3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33 (patch)
tree4e39d2295155392349986d5ae49fa6506e960560 /git-filter-branch.sh
parent0ad6f1a988312ebc2733126cf17f694d7008659f (diff)
parentf08aa017675bffe2359e0122cff2e447486b97c1 (diff)
downloadgit-3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33.zip
git-3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33.tar.gz
git-3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33.tar.bz2
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 'git-filter-branch.sh')
0 files changed, 0 insertions, 0 deletions