[prev in list] [next in list] [prev in thread] [next in thread] 

List:       password-store
Subject:    Re: [PATCH] Support git worktree.
From:       Kevin Lyda <kevin () ie ! suberic ! net>
Date:       2017-02-25 13:00:42
Message-ID: CADJ56BTD000xV9kNUfJJaoLgpJ+37MJamfkdkfq7-RvXzNzEug () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


I don't think the previous version would merge cleanly.

Kevin

On Sat, Feb 25, 2017 at 12:54 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:

> Okay okay okay, I'll merge it already! :) Sorry for the wait.
>
> I may very soon be ripping this logic out to do the git stuff a bit
> differently. But we'll see.
>

[Attachment #5 (text/html)]

<div dir="ltr">I don&#39;t think the previous version would merge \
cleanly.<div><br></div><div>Kevin</div></div><br><div class="gmail_quote"><div \
dir="ltr">On Sat, Feb 25, 2017 at 12:54 PM Jason A. Donenfeld &lt;<a \
href="mailto:Jason@zx2c4.com">Jason@zx2c4.com</a>&gt; wrote:<br></div><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">Okay okay okay, I&#39;ll merge it already! :) Sorry for the \
wait.<br class="gmail_msg"> <br class="gmail_msg">
I may very soon be ripping this logic out to do the git stuff a bit<br \
class="gmail_msg"> differently. But we&#39;ll see.<br class="gmail_msg">
</blockquote></div>



_______________________________________________
Password-Store mailing list
Password-Store@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/password-store


[prev in list] [next in list] [prev in thread] [next in thread]