[git-users] replicated git hosting

2012-11-18 Thread Thomas Koch
Hi, what would you call best practice for a highly available git hosting setup? We have servers in 3 datacenters. At best a git push should only complete if the data has been stored in at least two datacenters. The git "master" should automatically switch if one datacenter isn't available. Tha

Re: [git-users] How merge two or more commits??

2012-11-18 Thread Iñigo Medina
On Sun, 18 Nov 2012, Cesar Casasola wrote: Now I can't to access to tree complety. I have this for the moment $ git log --graph --oneline --decorate --all * 9d62a1f (HEAD, master) -Actualizacion de .gitignore * d4392db Actualizacion de .gitignore para no incluri los archivos del tipo .db * 9e9

Re: [git-users] How merge two or more commits??

2012-11-18 Thread Cesar Casasola
Now I can't to access to tree complety. I have this for the moment $ git log --graph --oneline --decorate --all * 9d62a1f (HEAD, master) -Actualizacion de .gitignore * d4392db Actualizacion de .gitignore para no incluri los archivos del tipo .db * 9e9d5f7 -Actualizacion de .gitignore * eef0663 com

Re: [git-users] How merge two or more commits??

2012-11-18 Thread Cesar Casasola
Now I can't to access to tree complety. I have this for the moment $ git log --graph --oneline --decorate --all * 9d62a1f (HEAD, master) -Actualizacion de .gitignore * d4392db Actualizacion de .gitignore para no incluri los archivos del tipo .db * 9e9d5f7 -Actualizacion de .gitignor

Re: [git-users] How merge two or more commits??

2012-11-18 Thread Konstantin Khomoutov
On Sun, Nov 18, 2012 at 03:05:43PM -0800, Cesar Casasola wrote: > In this case there are two commits > > > $ git log --graph --oneline --decorate --all [...] > How I can to merge the commits *261f502* and *9d62a1f?* > > If they were three or more commits? The graph tree appears to be comp

[git-users] How merge two or more commits??

2012-11-18 Thread Cesar Casasola
In this case there are two commits $ git log --graph --oneline --decorate --all * 9d62a1f (HEAD, master) -Actualizacion de .gitignore * d4392db Actualizacion de .gitignore para no incluri los archivos del tipo .db * 9e9d5f7 -Actualizacion de .gitignore * eef0663 commit ante

Re: [git-users] git 1.8 on windows ognores pageant

2012-11-18 Thread Lars Fischer
Am Sonntag, 18. November 2012 16:27:04 UTC+1 schrieb Konstantin Khomoutov: > > On Sun, 18 Nov 2012 06:39:03 -0800 (PST) > > Please bring it up on the msysgit mailing list [1] or its > bug tracker [2] instead. > > 1. http://groups.google.com/group/msysgit/ > 2. https://github.com/msysgit/msysgi

Re: [git-users] git 1.8 on windows ognores pageant

2012-11-18 Thread Konstantin Khomoutov
On Sun, 18 Nov 2012 06:39:03 -0800 (PST) Lars Fischer wrote: > I installed the latest git 1.8 together with putty and TortoiseGit on > a fresh Windows 7 system. > > ~/.ssh/config is used to configure different keys for different > servers. > > This combination worked well with older git version

[git-users] git 1.8 on windows ognores pageant

2012-11-18 Thread Lars Fischer
Hello, I installed the latest git 1.8 together with putty and TortoiseGit on a fresh Windows 7 system. ~/.ssh/config is used to configure different keys for different servers. This combination worked well with older git versions (msysgit). But now, the git shell commands do not recognize a loa

Re: [git-users] Track changing imports when using git mv on Python project

2012-11-18 Thread [MACSkeptic] Mozair Alves do Carmo Júnior
I'd definitely suggest pycharm (http://www.jetbrains.com/pycharm/) if you're looking for a python IDE. It also refactors Javascript quite well. On Sat, Nov 17, 2012 at 6:11 AM, Iñigo Medina wrote: > > On Fri, 16 Nov 2012, Mario wrote: > > @ Iñigo: >> I meant something like the following: >> >