From: Junio C Hamano <gitster@pobox.com>
To: "Uwe Kleine-König" <ukleinek@informatik.uni-freiburg.de>
Cc: "David Kågedal" <davidk@lysator.liu.se>, git <git@vger.kernel.org>
Subject: Re: [StGit PATCH 1/6] Split git.merge into two functions
Date: Wed, 22 Aug 2007 03:04:37 -0700 [thread overview]
Message-ID: <7v7innkhqi.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20070821193504.GA20823@informatik.uni-freiburg.de> (Uwe Kleine-König's message of "Tue, 21 Aug 2007 21:35:05 +0200")
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> writes:
> Hello David,
>
> Junio C Hamano wrote:
>> David Kågedal <davidk@lysator.liu.se> writes:
>>
>> > David Kågedal <davidk@lysator.liu.se> writes:
>> >
>> > It seems that git-send-email didn't like me for some reason. Double
>> > UTF-8 encoding is not very pretty.
>>
>> I believe Uwe (CC'ed) had a few patches to deal with this area.
>> Do they help?
>
> My patches are already in next, the relevant being probably
> v1.5.3-rc4-38-g94638f8.
It is in 'master' and in -rc5/-rc6.
next prev parent reply other threads:[~2007-08-22 10:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 8:11 [StGit PATCH 0/6] Use git conflict handling on push David Kågedal
2007-08-20 8:11 ` [StGit PATCH 1/6] Split git.merge into two functions David Kågedal
2007-08-20 8:11 ` [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged David Kågedal
2007-08-20 8:12 ` [StGit PATCH 3/6] Don't touch state after conflict in push David Kågedal
2007-08-20 8:12 ` [StGit PATCH 4/6] Added a test case to check what happens when push finds a conflict David Kågedal
2007-08-20 8:12 ` [StGit PATCH 5/6] Simplify merge_recursive David Kågedal
2007-08-20 8:12 ` [StGit PATCH 6/6] Use the output from merge-recursive to list conflicts David Kågedal
2007-08-22 9:21 ` [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged Karl Hasselström
2007-08-22 9:37 ` David Kågedal
2007-08-22 9:44 ` Karl Hasselström
2007-08-22 9:59 ` Karl Hasselström
2007-08-22 10:29 ` [StGIT PATCH] Leave working dir and index alone after failed (conflicting) push Karl Hasselström
2007-08-20 8:55 ` [StGit PATCH 1/6] Split git.merge into two functions David Kågedal
2007-08-20 23:52 ` Junio C Hamano
2007-08-21 19:35 ` Uwe Kleine-König
2007-08-22 10:04 ` Junio C Hamano [this message]
2007-08-22 9:17 ` [StGit PATCH 0/6] Use git conflict handling on push Karl Hasselström
2007-08-23 14:54 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2007-08-26 20:42 [StGIT PATCH 0/6] David's conflict series using my subprocess stuff Karl Hasselström
2007-08-26 20:42 ` [StGIT PATCH 1/6] Split git.merge into two functions Karl Hasselström
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=7v7innkhqi.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=davidk@lysator.liu.se \
--cc=git@vger.kernel.org \
--cc=ukleinek@informatik.uni-freiburg.de \
/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.