summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Michael Schubert <mschub@elegosoft.com>2012-04-07 16:25:52 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-09 15:06:50 -0700
commit31558fd48ea5911766781e676504d07eb70eeee5 (patch)
treee486e4a019e52d0486f651da24c0e6542faa38eb /builtin/merge-ours.c
parentGit 1.7.9.6 (diff)
downloadtgif-31558fd48ea5911766781e676504d07eb70eeee5.tar.xz
remote: update builtin usage
Add missing options "--tags|--no-tags" and "--push". Signed-off-by: Michael Schubert <mschub@elegosoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions