On Mon, Sep 29, 2014 at 5:59 PM, Matthieu Moy
wrote:
>> Ideally I'd like to see all the code changes to a code base just with
>> "git log -p".
>
> What I'd love to see with "git log -p" is the diff between a trivial
> merge (possibly including conflict markers) and the actual merge commit.
> That
> What I'd love to see with "git log -p" is the diff between a trivial
> merge (possibly including conflict markers) and the actual merge commit.
> That would imply that "git log" would redo the merge before computing
> the diff (rather heavyweight :-( ), but an empty diff would mean "no
> change o
John Tapsell writes:
> What if merge commits were forced into being always trivial?
It would be relatively easy to "force" a client to always have trivial
merges, but much harder to prevent an attacker to forge a non-trivial
merge commit (e.g. modifying his local git command) and push it.
> Ide
Rereading what I wrote, I came across as unintentionally harsh and
rude. Sorry about that - I was trying to be concise and terse, and it
went a bit wrong :)
What I was thinking to improve this is two short-term fixes:
1. Can we get git log -m -p . in the top level directory to show
the sa
Hi,
Our team just struggled with this problem, and I've created a
simple, 3 commit large, example git repository to demonstrate the
problem:
https://github.com/johnflux/ExampleEvilness2
The code: Adds a file, adds a security fix commit, then removes the
fix during a merge.
This happened by
5 matches
Mail list logo
