Hi Robert,
On 07/05/2019 15:10, Robert Dailey wrote:
The majority use case I'm interested in is seeing net-positive changes
that happen in merge commits. Normally I take for granted that merge
commits have nothing meaningful in them (meaningful here defined as
something unexpected for a merge co
On Tue, May 7, 2019 at 7:12 AM Robert Dailey wrote:
> On Mon, May 6, 2019 at 6:52 PM Ævar Arnfjörð Bjarmason
> wrote:
> The majority use case I'm interested in is seeing net-positive changes
> that happen in merge commits. Normally I take for granted that merge
> commits have nothing meaningful
On Tue, May 07, 2019 at 10:58:49AM -0400, Denton Liu wrote:
> For more details, this code[2] just blindly diffs the first two
> endpoints returned preceding `repo_init_revisions`.
If you throw in more than two endpoints, the result is a combined diff
with respect to the first commit. You can have
On Tue, May 07 2019, Robert Dailey wrote:
> On Mon, May 6, 2019 at 6:52 PM Ævar Arnfjörð Bjarmason
> wrote:
>> Maybe an example helps, let's say you have two paint buckets, one with
>> red paint, one with yellow paint. You mix them. What happens?
>>
>> (
>> rm -rf /tmp/git &&
>>
Hi Robert,
On Tue, May 07, 2019 at 09:10:12AM -0500, Robert Dailey wrote:
[snip]
> Even ignoring that issue, the more concerning observation of mine is
> that `diff @^!` produces any output at all. If you exclude both
> parents, why do I see a diff for parent 2 (I see the complete diff of
> the
On Tue, May 7, 2019 at 9:10 AM Robert Dailey wrote:
> Your example is very helpful. I understand what you're saying for
> conflicted lines. But the "whatever the default merge resolution would
> have been" doesn't exist, because there's no reality where line 1 in
> color.txt can be something "auto
On Mon, May 6, 2019 at 6:52 PM Ævar Arnfjörð Bjarmason wrote:
> Maybe an example helps, let's say you have two paint buckets, one with
> red paint, one with yellow paint. You mix them. What happens?
>
> (
> rm -rf /tmp/git &&
> git init /tmp/git &&
> cd /tmp/git &&
>
On Mon, May 06 2019, Robert Dailey wrote:
> I feel like you got hung up too much on exact wording of what I was
> trying to describe. I do apologize I don't have the background to
> explain things 100% accurately, especially at a low level. My
> explanations are mostly intended to be as a user,
On Mon, May 06, 2019 at 10:38:12AM -0500, Robert Dailey wrote:
> I feel like you got hung up too much on exact wording of what I was
> trying to describe. I do apologize I don't have the background to
> explain things 100% accurately, especially at a low level. My
> explanations are mostly intended
I feel like you got hung up too much on exact wording of what I was
trying to describe. I do apologize I don't have the background to
explain things 100% accurately, especially at a low level. My
explanations are mostly intended to be as a user, based on what is
observable, and based on intent. I'l
On Fri, May 03, 2019 at 10:55:54AM -0500, Robert Dailey wrote:
> I have a merge commit. HEAD is currently pointing at this merge
> commit. To be exact, HEAD points to master, which points to the merge
> commit. My goal is to diff only the changes in the merge commit (stuff
> committed directly in t
I'm hoping this is mostly a learning opportunity for me. I'm assuming
things are working as designed, but I just don't understand something
fundamental.
I have a merge commit. HEAD is currently pointing at this merge
commit. To be exact, HEAD points to master, which points to the merge
commit. My
12 matches
Mail list logo
