[git-users] git-svn.perl should check GIT_ASKPASS environment

2011-02-11 Thread Jose
git-svn.perl problem. prompt: print STDERR $may_save ? "(R)eject, accept (t)emporarily or accept (p)ermanently? " : "(R)eject or accept (t)emporarily? "; STDERR->flush; $choice = lc(substr( || 'R', 0, 1)); which should check GIT_ASKPASS environm

[git-users] Re: git-svn.perl should check GIT_ASKPASS environment

2011-02-11 Thread Thomas Ferris Nicolaisen
Sounds like something for the main git list: http://vger.kernel.org/vger-lists.html#git -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, sen

[git-users] diffs within the whole content of a file

2011-02-11 Thread Andrej Khitrov
I have 2 revisions of a file at HEAD and HEAD^. I want to manually compose new version of the file out of these two ones. I try to get the whole content of the file with diffs `git diff -U HEAD^..HEAD -- myfile`. With `-U` I try to lift the limits of the context. But I'd like to escape from

Re: [git-users] diffs within the whole content of a file

2011-02-11 Thread Konstantin Khomoutov
On Fri, 11 Feb 2011 04:50:05 -0800 (PST) Andrej Khitrov wrote: > I have 2 revisions of a file at HEAD and HEAD^. I want to manually > compose new version of the file out of these two ones. I try to get > the whole content of the file with diffs `git diff -U HEAD^..HEAD > -- myfile`. With `-U9

[git-users] Re: diffs within the whole content of a file

2011-02-11 Thread Andrej Khitrov
> May be you meant > > $ git show HEAD:your_file >/tmp/your-file-as-in-HEAD > $ git show HEAD^:your_file >/tmp/your-file-as-in-HEADs-parent > > ? No. But OK, I have realized that my problem concerns rather diff tools than git itself. If I create those two files in /tmp/ with your commands, then I'

Re: [git-users] Re: diffs within the whole content of a file

2011-02-11 Thread Konstantin Khomoutov
On Fri, 11 Feb 2011 08:49:47 -0800 (PST) Andrej Khitrov wrote: > > May be you meant > > > > $ git show HEAD:your_file >/tmp/your-file-as-in-HEAD > > $ git show HEAD^:your_file >/tmp/your-file-as-in-HEADs-parent > > > > ? > > No. But OK, I have realized that my problem concerns rather diff tools

[git-users] Need help using Gitosis

2011-02-11 Thread hujiko
Hi, i have set up a git server on ubuntu, and everthing works fine :) Now i want to use the current sourcecode to be linked in my apache www directory. So when i push to the server, i want a symlink in my apache-dir linking to the current head state How to do that? -- You received this message

Re: [git-users] Need help using Gitosis

2011-02-11 Thread Konstantin Khomoutov
On Fri, 11 Feb 2011 10:27:09 -0800 (PST) hujiko wrote: > i have set up a git server on ubuntu, and everthing works fine :) > Now i want to use the current sourcecode to be linked in my apache www > directory. > So when i push to the server, i want a symlink in my apache-dir > linking to the curre

[git-users] Re: Need help using Gitosis

2011-02-11 Thread hujiko
I mean: I biuld my Website via git. When i push to my repos server i want my website getting updatet automatically So when I visit my site after push, i should see the new content On 11 Feb., 20:00, Konstantin Khomoutov wrote: > On Fri, 11 Feb 2011 10:27:09 -0800 (PST) > > It's not quite clear wh

[git-users] Setting up a remote repo when the local is already in course

2011-02-11 Thread Daniel Trezub
Hi, I've been working with git in my local repo for some months already (i.e. there is already a bunch of commits and some branches), and I'd like to use git to integrate with my online server (use git pull, push, clone, fetch, etc). How should I start? Is there a way to do this without messing w

Re: [git-users] Deleting a commit

2011-02-11 Thread Daniel Trezub
Thanks a LOT, Martin. :) = Daniel Trezub http://www.gameblogs.com.br On 10 February 2011 22:13, Martin Fick wrote: > Oops, forgot that I use git aliases: > > On Thursday 10 February 2011 05:11:18 pm Martin Fick wrote: > > One way to do it: > > > > Check out the last good commit: > > > >