On Thu, 2013-03-28 at 16:43 -0400, Dale R. Worley wrote:
If you think about it, in many situations git commit -a is what a
software developer wants to use. Various trash files can accumulate
in a working copy; you usually only want to commit files that have
been specially pointed out as being
On Fri, 29 Mar 2013 08:49:55 -0400
Paul Smith p...@mad-scientist.net wrote:
On Thu, 2013-03-28 at 16:43 -0400, Dale R. Worley wrote:
If you think about it, in many situations git commit -a is what a
software developer wants to use. Various trash files can accumulate
in a working copy; you
From: Paul Smith p...@mad-scientist.net
Sorry, I was unclear. No, I didn't use --index as I wanted to see the
applied content before it was committed.
I ran git diff -M -C master to generate the patch of changes between
my working directory and the master branch, then ran git apply (no
On Thu, 2013-03-28 at 10:22 -0400, Dale R. Worley wrote:
When apply is done and I run git status -s, the files that were
specified as deleted in the diff are marked as D but the files that
were specified as added in the diff are marked as ?? (untracked), not
A as I'd expected. Running
From: Paul Smith p...@mad-scientist.net
Maybe I should restate. The problem is that if I run git apply
followed by git commit -a, the files that were modified and deleted
are both committed, but new files from the patch are not committed.
That is true.
I sort of understand it from a Git
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
