On Tue, 2013-03-26 at 22:30 +, Philip Oakley wrote:
From: Paul Smith p...@mad-scientist.net
Sent: Tuesday, March 26, 2013 9:11 PM
On Tue, 2013-03-26 at 20:46 +, Philip Oakley wrote:
We accept that git blame across the reformat will not be useful.
I'm going to lay down a label
I must be overlooking something, because I don't think that you would
see the effect you are expecting:
From: Paul Smith p...@mad-scientist.net
We accept that git blame across the reformat will not be useful. I'm
going to lay down a label right before the reformat, so people can use
that
On Wed, 2013-03-27 at 11:30 -0400, Dale R. Worley wrote:
I do not see why merging a branch in will cause all lines in the file
to be marked as changed by the user who did the merge (from whose
branch the merge was done). Assuming the reformatting in the master
and the reformatting in the
From: Paul Smith p...@mad-scientist.net
I'm not sure exactly how git blame works: the naive implementation
would walk back commits until it found one where each line was changed
(using a string compare). If that were the algorithm, the above would
work as I want. Obviously git blame is
On Wed, 2013-03-27 at 13:51 -0400, Dale R. Worley wrote:
But it suggests that if the same change
was made in multiple ancestor commits, git-blame might be picking out
the commit with the latest modification time.
I can see an argument to be made for both models of handling multiple
commits
So, I have a patch that was created with git diff (can't use
format-patch in my situation). If the patch deletes files, such as:
diff --git a/foo.cpp b/foo.cpp
deleted file mode 100644
index ccfb3ce..000
--- a/foo.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
- ...
then those deletes are
On Wed, Mar 27, 2013 at 04:07:14PM -0400, Paul Smith wrote:
So, I have a patch that was created with git diff (can't use
format-patch in my situation). If the patch deletes files, such as:
[...]
then this file is just left in my workspace as an untracked file, and
not added with git add.
From: Paul Smith p...@mad-scientist.net
So, I have a patch that was created with git diff (can't use
format-patch in my situation). If the patch deletes files, such as:
then those deletes are reflected in Git after the git apply, which is
good. But, if my patch ADDS a file, such as:
On Wed, 2013-03-27 at 17:48 -0400, Dale R. Worley wrote:
From: Paul Smith p...@mad-scientist.net
So, I have a patch that was created with git diff (can't use
format-patch in my situation). If the patch deletes files, such as:
then those deletes are reflected in Git after the git
