On Wed, 7 Dec 2011 17:11:52 +0100
Richard Hartmann wrote:
> On Wed, Dec 7, 2011 at 16:21, Adam Spiers wrote:
>
> > On Wed, Dec 7, 2011 at 2:34 PM, Antonio Ospite
> > wrote:
>
> >> or where else?
> >
> > Good question - I will probably write zsh completion rules for mr
> > at some point too.
On Sat, Dec 17, 2011 at 11:20 AM, Antonio Ospite
wrote:
> On Wed, 7 Dec 2011 17:11:52 +0100
> Richard Hartmann wrote:
>
>> On Wed, Dec 7, 2011 at 16:21, Adam Spiers wrote:
>>
>> > On Wed, Dec 7, 2011 at 2:34 PM, Antonio Ospite
>> > wrote:
>>
>> >> or where else?
>> >
>> > Good question - I wil
On Fri, Dec 16, 2011 at 23:47, Sean Whitton wrote:
> After a recent pull/annex merge/push I noticed that my git-annex’d dir
> is filled with three character hex named folders, which contain more
> such folders, which contain log files named after my annex’d files (I
> think).
You merged the bran
On Sat, 17 Dec 2011 11:58:18 +
Adam Spiers wrote:
> On Sat, Dec 17, 2011 at 11:20 AM, Antonio Ospite
> wrote:
> > On Wed, 7 Dec 2011 17:11:52 +0100
> > Richard Hartmann wrote:
> >
[...]
> >>
> >> For zsh, it's
> >>
> >> /usr/share/zsh/functions/Completion/Unix/_mr
> >>
> >> but just send
On Sat, Dec 17, 2011 at 2:14 PM, Antonio Ospite
wrote:
> On Sat, 17 Dec 2011 11:58:18 +
> Adam Spiers wrote:
>> Unfortunately, in practice this isn't perfect, because (a) a program's
>> upstream maintainer(s) and its completion rule maintainer(s) are often
>> not the same people (e.g. the mai
On 17 Dec 2011 at 13:59Z, Richard Hartmann wrote:
> You merged the branches master and git-annex.
The only merge command I typed was “git annex merge”—surely that should
do the right thing?
Is a revert, rebase or reset the best way to undo the damage I’ve done
here?
> As a dirty hack to prevent
Sean Whitton wrote:
> The only merge command I typed was “git annex merge”—surely that should
> do the right thing?
git-annex merge can't do this, but git merge git-annex certianly could..
> Is a revert, rebase or reset the best way to undo the damage I’ve done
> here?
Yes.
--
see shy jo
sig