From: Markus Heidelberg <markus.heidelberg@web.de>
To: David Aguilar <davvid@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH 6/8] sh-tools: add a run_merge_tool function
Date: Mon, 30 Mar 2009 08:55:09 +0200 [thread overview]
Message-ID: <200903300855.09353.markus.heidelberg@web.de> (raw)
In-Reply-To: <1238389428-69328-7-git-send-email-davvid@gmail.com>
David Aguilar, 30.03.2009:
> + if mergetool_mode; then
> + base=Baes
Base
> + local=Local
> + remote=Remote
> + else
next prev parent reply other threads:[~2009-03-30 6:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-30 5:03 (unknown), David Aguilar
2009-03-30 5:03 ` [PATCH 1/8] mergetool: use tabs consistently David Aguilar
2009-03-30 5:03 ` [PATCH 2/8] mergetool: use $( ... ) instead of `backticks` David Aguilar
2009-03-30 5:03 ` [PATCH 3/8] sh-tools: add a git-sh-tools shell helper script David Aguilar
2009-03-30 5:03 ` [PATCH 4/8] mergetool: refactor git-mergetool to use git-sh-tools David Aguilar
2009-03-30 5:03 ` [PATCH 5/8] difftool: refactor git-difftool " David Aguilar
2009-03-30 5:03 ` [PATCH 6/8] sh-tools: add a run_merge_tool function David Aguilar
2009-03-30 5:03 ` [PATCH 7/8] mergetool: refactor git-mergetool to use run_merge_tool David Aguilar
2009-03-30 5:03 ` [PATCH 8/8] difftool: refactor git-difftool-helper " David Aguilar
2009-03-30 6:55 ` Markus Heidelberg [this message]
2009-03-30 7:32 ` [PATCH 6/8] sh-tools: add a run_merge_tool function Markus Heidelberg
2009-03-30 7:46 ` David Aguilar
2009-03-30 8:44 ` [PATCH 1/8] mergetool: use tabs consistently Junio C Hamano
2009-03-30 9:22 ` David Aguilar
2009-03-30 21:35 ` Charles Bailey
2009-03-31 6:36 ` David Aguilar
2009-04-01 17:56 ` Junio C Hamano
2009-03-30 7:02 ` Markus Heidelberg
2009-03-30 8:46 ` Re: Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200903300855.09353.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.