Ludovic Rousseau wrote:
> Merging a pull request from github adds a "merge pull request" commit.
> The history is then not very nice (linear) but I don't know a better
> way using the github web interface.
It isn't neccessary to use the github web interface just because
github is used to host the
Le 10/12/2012 17:10, Greg Troxel a écrit :
> Anthony Foiani writes:
>
>> Ludovic, greetings --
>>
>> On Sun, Dec 9, 2012 at 7:19 AM, Ludovic Rousseau
>> wrote:
>>> 2012/12/8 Anthony Foiani :
Greetings --
I have two small patches which you might want to consider integrating.
>>
Anthony Foiani writes:
> Ludovic, greetings --
>
> On Sun, Dec 9, 2012 at 7:19 AM, Ludovic Rousseau
> wrote:
>>
>> 2012/12/8 Anthony Foiani :
>> > Greetings --
>> >
>> > I have two small patches which you might want to consider integrating.
>> >
>> > (And given that I can't get git to do what I
2012/12/10 Anthony Foiani :
> Ludovic, greetings --
>
> On Sun, Dec 9, 2012 at 7:19 AM, Ludovic Rousseau
> wrote:
>>
>> 2012/12/8 Anthony Foiani :
>> > Greetings --
>> >
>> > I have two small patches which you might want to consider integrating.
>> >
>> > (And given that I can't get git to do what
Frank, greetings --
On Mon, Dec 10, 2012 at 12:23 AM, Frank Morgner
wrote:
> Your editor should be intelligent enough to guess the right settings.
Why have the editor guess, when it could know the right answer?
> For vim I recently found this plugin
> http://www.vim.org/scripts/script.php?scrip
Hi!
> > > https://github.com/tkil/OpenSC/commit/0c4a2e0c4063f31bc41c34e45869b9a9e7ca41d7
> > > This uses "dir local" settings to configure Emacs indentation correctly.
> >
> > I don't think that an Emacs configuration file should be added to the
> > OpenSC source code.
>
> Hm. Why not? It would
Ludovic, greetings --
On Sun, Dec 9, 2012 at 7:19 AM, Ludovic Rousseau
wrote:
>
> 2012/12/8 Anthony Foiani :
> > Greetings --
> >
> > I have two small patches which you might want to consider integrating.
> >
> > (And given that I can't get git to do what I want, you probably want
> > to just che
2012/12/8 Anthony Foiani :
> Greetings --
>
> I have two small patches which you might want to consider integrating.
>
> (And given that I can't get git to do what I want, you probably want
> to just cherry-pick these, as I suspect I've completely destroyed my
> repo history...)
You should rebase
Greetings --
I have two small patches which you might want to consider integrating.
(And given that I can't get git to do what I want, you probably want
to just cherry-pick these, as I suspect I've completely destroyed my
repo history...)
https://github.com/tkil/OpenSC/commit/0c4a2e0c4063f31bc41
