summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-01 16:37:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-01 16:37:34 -0800
commite760924cbeb19c6e45febdb31d9d6c95deaf2b43 (patch)
tree4f426511d6a035ab97addf72b5fddeba7c23d3e3 /builtin/merge-recursive.c
parentt0003: add missing && at end of lines (diff)
parentadd: introduce add.ignoreerrors synonym for add.ignore-errors (diff)
downloadtgif-e760924cbeb19c6e45febdb31d9d6c95deaf2b43.tar.xz
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions