On Mon, May 23, 2016 at 1:30 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Nathan Collins <nathan.coll...@gmail.com> writes:
>
>> Example session:
>>
>> $ git init test.git
>> Initialized empty Git repository in /tmp/test.git/.git/
>
Example session:
$ git init test.git
Initialized empty Git repository in /tmp/test.git/.git/
$ cd test.git
$ mkdir "dir name"
$ touch dir\ name/file.txt
$ echo "dir\\ name/file.txt -text -whitespace" >> .git/info/attributes
$ git add dir\ name/file.txt
On Wed, May 7, 2014 at 11:42 AM, Junio C Hamano gits...@pobox.com wrote:
Nathan Collins nathan.coll...@gmail.com writes:
For (2), the solution may be to add a separate
'diff.add-clickable-paths' option (probably there is a better name?
'diff.add-copyable-paths'? ...),...
...
Concretely
On Wed, May 7, 2014 at 4:39 PM, Nathan Collins nathan.coll...@gmail.com wrote:
On Wed, May 7, 2014 at 11:42 AM, Junio C Hamano gits...@pobox.com wrote:
Nathan Collins nathan.coll...@gmail.com writes:
For (2), the solution may be to add a separate
'diff.add-clickable-paths' option (probably
On Wed, May 7, 2014 at 9:38 PM, Nathan Collins nathan.coll...@gmail.com wrote:
On Wed, May 7, 2014 at 4:39 PM, Nathan Collins nathan.coll...@gmail.com
wrote:
On Wed, May 7, 2014 at 11:42 AM, Junio C Hamano gits...@pobox.com wrote:
Nathan Collins nathan.coll...@gmail.com writes:
For (2
On Tue, May 6, 2014 at 11:10 AM, Junio C Hamano gits...@pobox.com wrote:
Nathan Collins nathan.coll...@gmail.com writes:
Hmmm. Maybe a warning that the patch is expected to be in '-p1'
format, and that setting 'diff.noprefix=true' makes some commands
generate '-p0' patches?
some? Do you
On Tue, May 6, 2014 at 2:12 PM, Junio C Hamano gits...@pobox.com wrote:
Nathan Collins nathan.coll...@gmail.com writes:
But 'git apply' could be much more helpful than 'patch' even, since
the presence or absence of the 'a/' and 'b/' prefixes in the patch,
and the 'diff.noprefix' setting, give
On Wed, Apr 30, 2014 at 7:40 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Hi,
Nathan Collins wrote:
Patches created with 'diff.noprefix=true' don't 'git apply' without
specifying '-p0'.
I'm not sure this is a bug -- the 'man git-apply' just says Reads the
supplied diff output (i.e
Bug?
Patches created with 'diff.noprefix=true' don't 'git apply' without
specifying '-p0'.
I'm not sure this is a bug -- the 'man git-apply' just says Reads the
supplied diff output (i.e. a patch) and applies it to files -- but
I would expect patches I create locally to apply cleanly
Bug
===
The command
git rebase --whitespace=fix --keep-empty commit
does not fix whitespace in the rebased commits.
Example
===
Set up a repo with a whitespace error commit and an empty commit:
git init rebase-bug.git
cd rebase-bug.git
touch foo
git add foo
touch foo
git
On Tue, Nov 19, 2013 at 5:50 PM, Tim Chase g...@tim.thechases.com wrote:
Having lost add -p work enough times when stashing, I finally
dug into the docs to see how to prevent it, discovering that
--keep-index does exactly what I want.
Note that 'git stash (pop | apply) --index' will reinstate
11 matches
Mail list logo
