summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorRalf Thielow <ralf.thielow@gmail.com>2015-09-11 15:53:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-11 16:50:00 (GMT)
commit7306b39f5ad6d8428cdb6caf7ce38bfc38ee091a (patch)
tree1129dc0c50a54cb18662a349e3094d0d0995107f /resolve-undo.c
parent689efb737a7b46351850eefdfa57d2ce232011fb (diff)
downloadgit-7306b39f5ad6d8428cdb6caf7ce38bfc38ee091a.zip
git-7306b39f5ad6d8428cdb6caf7ce38bfc38ee091a.tar.gz
git-7306b39f5ad6d8428cdb6caf7ce38bfc38ee091a.tar.bz2
pull: don't mark values for option "rebase" for translation
"false|true|preserve" are actual values for option "rebase" of the "git-pull" command and should therefore not be marked for translation. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions