From: Petr Baudis <pasky@suse.cz>
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Documentation/git-merge.txt: Expand the How Merge Works section
Date: Thu, 17 Jul 2008 18:42:19 +0200 [thread overview]
Message-ID: <20080717164219.GX32184@machine.or.cz> (raw)
In-Reply-To: <20080717162922.12081.96582.stgit@localhost>
On Thu, Jul 17, 2008 at 06:29:32PM +0200, Petr Baudis wrote:
> foo | 1
> 2 files changed, 59 insertions(+), 35 deletions(-)
> create mode 100644 foo
*Cough* Sorry about this. I think there is currently no need to merge
the 'foo' bit. ;-)
Petr "Pasky" Baudis
next prev parent reply other threads:[~2008-07-17 16:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-17 16:29 [PATCH] Documentation/git-merge.txt: Expand the How Merge Works section Petr Baudis
2008-07-17 16:42 ` Petr Baudis [this message]
2008-07-17 18:17 ` Junio C Hamano
2008-07-17 18:54 ` Petr Baudis
2008-07-17 19:34 ` Junio C Hamano
2008-07-18 13:18 ` Petr Baudis
2008-07-18 13:20 ` [PATCH] Documentation/git-merge.txt: Partial rewrite of How Merge Works Petr Baudis
2008-07-19 0:32 ` [PATCH] Documentation/git-merge.txt: Expand the How Merge Works section Junio C Hamano
2008-07-19 18:17 ` [PATCH] Documentation/git-merge.txt: Partial rewrite of How Merge Works Petr Baudis
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=20080717164219.GX32184@machine.or.cz \
--to=pasky@suse.cz \
--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.