summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-11-11 14:46:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-11 14:49:50 -0800
commit8bb4646dae89035695e72a39d6fe1c0f364ea0aa (patch)
tree1bb31c78644ac1eb034212b97f3730733286ebae /git-merge-octopus.sh
parentMerge branch 'maint' (diff)
parentFix non-literal format in printf-style calls (diff)
downloadtgif-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.xz
Merge branch 'maint'
* maint: Fix non-literal format in printf-style calls git-submodule: Avoid printing a spurious message. git ls-remote: make usage string match manpage Makefile: help people who run 'make check' by mistake
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions