Hi,
The problem here is not the LF to CRLF conversion i know where that
comes from. The problem is that doing
git add '' CDD/CDD_Diag.c
results in a message about another file which was clearly not my
intention to add.
Cheers,
Gui
On Fri, Nov 14, 2014 at 8:26 PM, Philip Oakley wrote:
> -
gt;> > From: Guilherme
>> > git add '' CDD/CDD_Diag.c
>>
>> When I experiment, "git add ''" seems to have the same effect as "git
>> add .", which is not surprsing.
>
> (i'm not the OP)
>
> it *is* very much
Hello,
In my .git/info/exclude i have the patterns:
!COM/config/Project.gny
(...) other ignores
/COM/config
(...) more ignores
When i do
git add -- COM/config/Project.gny
I get no warnings or abort about the ignored path (as i expect) but
git add -- COM/config/Project.gny COM/otherfile.c
It
Hello,
I'm trying to implement support for gitignore files in
the_silver_searcher (https://github.com/ggreer/the_silver_searcher).
It is a source code optimized version of grep. And it is way faster
than ack.
The problems at hand is that I'd like to use wildmatch.c and some
dependencies (hex.c, s
Hi,
quickly after posting to this mailing i realized that and sent a copy
to the dev list.
Thanks for the clarification.
On Tue, Feb 24, 2015 at 1:55 PM, Konstantin Khomoutov
wrote:
> On Tue, 24 Feb 2015 09:02:21 +0100
> Guilherme wrote:
>
> [...]
>> The problems at hand i
Hello,
I am a PhD candidate researching about merge tools and doing experiments
with git and github.
I know that when the *git merge* command fails in presence of conflicts, it
is possible to invoke external merge tools through the command* git
mergetool* to resolve conflicts.
I was wondering i
Nice. Many thanks. I'll give it a try and inform here..
Em quinta-feira, 4 de agosto de 2016 13:15:57 UTC-3, Konstantin Khomoutov
escreveu:
>
> On Thu, 4 Aug 2016 08:33:57 -0700 (PDT)
> Guilherme Cavalcanti > wrote:
>
> > I am a PhD candidate researching a
Dears,
I am facing situations in which only one of the developers/branches changes
a specific file, but git merge reports a merge conflict for that file. So,
why is git reporting conflict for files not mutually changed?
In the example below, the file "OutOfTimeCrossValidatorRunner.java"
(unde
ol) change)?
>
> You may have a 3-way merge (mergebase, left and right commits) detecting
> the white space anomaly.
>
> P.
>
> On Monday, May 25, 2020 at 5:05:21 PM UTC+1, Guilherme Cavalcanti wrote:
>>
>> Dears,
>>
>> I am facing situations in which only o
After clone a github repository in my PC, a file is showing like a modified
file. But the last modification in this file was done 8 months ago. How is
possible? I tried execute "git checkout -- ." but the file continues like a
modified file.
Anybody have a tip/solution for the problem?
--
Y
liam Seiti Mizuta
> @williammizuta
> Caelum | Ensino e Inovação
> www.caelum.com.br
>
>
> On Tue, Feb 26, 2013 at 11:31 PM, José Guilherme Vanz <
> guilherme@gmail.com> wrote:
>
>> After clone a github repository in my PC, a file is showing like a
>> modified fil
February 2013 00:24, Dale R. Worley wrote:
> > From: José Guilherme Vanz
> >
> > For a better explanation. This modified file is shown like all its lines
> > have been deleted and included again...
>
> That symptom means that the file formerly had LF line endings and
Dears,
Well, I tried and I'm trying new tests with Githook, Can I change owner
directories and files for apache?
Because, I try add script with name post-merge on directory hooks, but when
I execute command git pull, don't execute my scripts. Any idea? I look
inumerals howtoo.
When I customiz
13 matches
Mail list logo
