aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorPierre Habouzit <madcoder@debian.org>2008-11-11 00:54:00 +0100
committerJunio C Hamano <gitster@pobox.com>2008-11-11 20:31:26 -0800
commit5df9fcf695a0ba85abfeed68efb3b1c5890068d6 (patch)
tree68523b66d4dc2f2edd36be3db546bfdbc50b6eff /git-mergetool.sh
parentcaf0c3d692a5a4639e48499711271cb279ecd0dc (diff)
downloadgit-5df9fcf695a0ba85abfeed68efb3b1c5890068d6.tar.gz
git-5df9fcf695a0ba85abfeed68efb3b1c5890068d6.tar.xz
git send-email: interpret unknown files as revision lists
Filter out all the arguments git-send-email doesn't like to a git format-patch command, that dumps its content to a safe directory. Barf when a file/revision conflict occurs, allow it to be overriden --[no-]format-patch. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions