diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:40 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:37:40 -0700 |
commit | c39e9eb3df18c34330d50ebfae28b42880d9a4cc (patch) | |
tree | e401088b387f87c81127c707e381d61176905226 /git-send-email.perl | |
parent | f621a8454d19d17fe46e6951b7e3d22bebd92aba (diff) | |
parent | f0df1293acdba9513cae17e2c63b4169f1347371 (diff) | |
download | git-c39e9eb3df18c34330d50ebfae28b42880d9a4cc.tar.gz |
Merge branch 'maint'
* maint:
gitweb/README: Document $base_url
Documentation: git submodule: add missing options to synopsis
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-x | git-send-email.perl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index d508f83349..0700d80afc 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -450,7 +450,6 @@ sub check_file_rev_conflict($) { try { $repo->command('rev-parse', '--verify', '--quiet', $f); if (defined($format_patch)) { - print "foo\n"; return $format_patch; } die(<<EOF); |