summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-02 12:06:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-02 12:13:27 -0800
commitcbcab75c54b5956dcaa4f24a4074bc99adc49629 (patch)
treee9d851dd8899741fbd10da9215887473f29cd1ee /git-merge-octopus.sh
parentadd: introduce add.ignoreerrors synonym for add.ignore-errors (diff)
downloadtgif-cbcab75c54b5956dcaa4f24a4074bc99adc49629.tar.xz
Git 1.7.0.8
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions