summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2010-11-08 18:01:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-15 18:04:43 (GMT)
commit76946b76fe3d26507d61cae97aa0676fad24ed92 (patch)
treecb637a3012a3b7f5f448ff660106ba1e2595da09 /builtin/merge-file.c
parentd52ee6e6131f65bb4360743ebea2e7b400b544e4 (diff)
downloadgit-76946b76fe3d26507d61cae97aa0676fad24ed92.zip
git-76946b76fe3d26507d61cae97aa0676fad24ed92.tar.gz
git-76946b76fe3d26507d61cae97aa0676fad24ed92.tar.bz2
add OPT__FORCE
Add OPT__FORCE as a helper macro in the same spirit as OPT__VERBOSE et.al. to simplify defining -f/--force options. Signed-off-by: Rene Scharfe <rene.scharfe@lstfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions