summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Caio Marcelo de Oliveira Filho <cmarcelo@gmail.com>2008-05-09 19:55:43 -0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-11 10:12:19 -0700
commit37c22a4bf801403f71a5e9674d8e314ce575945e (patch)
tree79c28a0744ecb092a845f7e8b8dd8ca766ae944e /builtin-merge-ours.c
parentAllow tracking branches to set up rebase by default. (diff)
downloadtgif-37c22a4bf801403f71a5e9674d8e314ce575945e.tar.xz
git-format-patch: add --no-binary to omit binary changes in the patch.
Add a new option --no-binary to git-format-patch so that no binary changes are included in the generated patches, only notices that those files changed. This generate patches that cannot be applied, but still is useful for generating mails for code review purposes. See also: commit e47f306d4bf964def1a0b29e8f7cea419471dffd, where --binary option was turned on by default. Signed-off-by: Caio Marcelo de Oliveira Filho <cmarcelo@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