Elijah Newren writes:
> ... Instead, I decided that
> instead of having a "from" and a "to" header, we would have N "from"
> headers (since all parents are what we came from) and 1 "to" header.
> I hope that makes sense, because otherwise I think this become to
> unwieldy of a change.
Yeah, it m
On Fri, Jan 25, 2019 at 2:21 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > Also, my first version of the patch actually showed all names, on all
> > lines, but I found the heavy repetition really annoying, and not in
> > keeping with how non-merge commits are handled (where original
>
Elijah Newren writes:
> Also, my first version of the patch actually showed all names, on all
> lines, but I found the heavy repetition really annoying, and not in
> keeping with how non-merge commits are handled (where original
> filenames are only shown when they differ). Granted, my change is
On Fri, Jan 25, 2019 at 11:29 AM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > The raw diff format for merges with -c or --cc will only list one
> > filename, even if rename detection is active and a rename was detected
> > for the given path. Examples:
> >
> > ::100644 100644 100644 f
Elijah Newren writes:
> The raw diff format for merges with -c or --cc will only list one
> filename, even if rename detection is active and a rename was detected
> for the given path. Examples:
>
> ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
> ::100755 100755 100755 52b7a
Hi,
On Fri, Jan 25, 2019 at 6:45 AM Derrick Stolee wrote:
>
> On 1/24/2019 11:46 AM, Elijah Newren wrote:
> > As an alternative, I considered perhaps trying to sell it as a bugfix
> > (how often do people use -M, -c, and --raw together and have renames
> > in merge commits -- can I just change th
Hi,
On Thu, Jan 24, 2019 at 6:19 PM brian m. carlson
wrote:
>
> On Thu, Jan 24, 2019 at 08:46:54AM -0800, Elijah Newren wrote:
> > The critical part of the patch is the few line change to
> > show_raw_diff(), the rest is plumbing to set that up.
> >
> > This patch was based out of Peff's suggesti
On 1/24/2019 11:46 AM, Elijah Newren wrote:
> As an alternative, I considered perhaps trying to sell it as a bugfix
> (how often do people use -M, -c, and --raw together and have renames
> in merge commits -- can I just change the format to include the old
> names), but was worried that since diff-
On Thu, Jan 24, 2019 at 08:46:54AM -0800, Elijah Newren wrote:
> The critical part of the patch is the few line change to
> show_raw_diff(), the rest is plumbing to set that up.
>
> This patch was based out of Peff's suggestion[1] to fix diff-tree to
> do what I needed rather than bending fast-exp
The raw diff format for merges with -c or --cc will only list one
filename, even if rename detection is active and a rename was detected
for the given path. Examples:
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
10 matches
Mail list logo
