summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2017-04-19 09:15:15 +0000
committerJunio C Hamano <gitster@pobox.com>2017-04-19 20:03:56 -0700
commit61e282425abd78605524322f05a49866b2c9e70e (patch)
treefec5a8cb5114951ddb4bed519d1c1d0062fed630 /builtin-merge-ours.c
parent49800c940790cc7465d1b03e08d472ffd8684808 (diff)
downloadgit-ss/gitmodules-ignore-doc.tar.gz
gitmodules: clarify the ignore option valuesss/gitmodules-ignore-doc
Add more structure and describe each possible option in a self-contained way, not referring to any of the previously described options. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions