summaryrefslogtreecommitdiffstats
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-20 23:24:23 +0100
committerJunio C Hamano <gitster@pobox.com>2012-03-20 23:24:23 +0100
commitbd193f46b70fd3f8a55e2a8dcbb1fb2b4eec13d6 (patch)
tree2761d246f3e66b31669866e70e3fb07c779a6693 /git-merge-octopus.sh
parentMerge branch 'maint-1.7.7' into maint-1.7.8 (diff)
parentgitweb: Fix actionless dispatch for non-existent objects (diff)
downloadgit-bd193f46b70fd3f8a55e2a8dcbb1fb2b4eec13d6.tar.xz
git-bd193f46b70fd3f8a55e2a8dcbb1fb2b4eec13d6.zip
Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8
* jn/gitweb-unspecified-action: gitweb: Fix actionless dispatch for non-existent objects
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions