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
name/file.txt
On Mon, May 23, 2016 at 1:30 PM, Junio C Hamano wrote:
> Nathan Collins writes:
>
>> Example session:
>>
>> $ git init test.git
>> Initialized empty Git repository in /tmp/test.git/.git/
>> $ cd test.git
>> $ mkdir "dir name"
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 loc
On Wed, Apr 30, 2014 at 7:40 PM, Jonathan Nieder 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
On Tue, May 6, 2014 at 11:10 AM, Junio C Hamano wrote:
> Nathan Collins 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' pat
On Tue, May 6, 2014 at 2:12 PM, Junio C Hamano wrote:
> Nathan Collins 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,
>>
On Wed, May 7, 2014 at 11:42 AM, Junio C Hamano wrote:
> Nathan Collins 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'? ...),...
>> ...
On Wed, May 7, 2014 at 4:39 PM, Nathan Collins wrote:
> On Wed, May 7, 2014 at 11:42 AM, Junio C Hamano wrote:
>> Nathan Collins writes:
>
>>> For (2), the solution may be to add a separate
>>> 'diff.add-clickable-paths' option (probably there is a b
On Wed, May 7, 2014 at 9:38 PM, Nathan Collins wrote:
> On Wed, May 7, 2014 at 4:39 PM, Nathan Collins
> wrote:
>> On Wed, May 7, 2014 at 11:42 AM, Junio C Hamano wrote:
>>> Nathan Collins writes:
>>
>>>> For (2), the solution may be to add a separate
Bug
===
The command
git rebase --whitespace=fix --keep-empty
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 add foo
On Tue, Nov 19, 2013 at 5:50 PM, Tim Chase 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 the index
as it
11 matches
Mail list logo
