[git-users] Backup/restore local repo

2012-07-09 Thread Daniel Trezub
an I get my git tree back? Thanks for any help! = Daniel Trezub http://www.gameblogs.com.br -- 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 t

Re: [git-users] Fetch question

2011-02-16 Thread Daniel Trezub
Thanks for your fast answer, Konstantin! > It's hard to tell exactly what's going on as you did not tell anything > about your setup and are using vague terms like "my dir". My dir refers to the git controlled directory, the wordpress installation directory. > In any case, I have two points to t

[git-users] Fetch question

2011-02-15 Thread Daniel Trezub
a remote/origin/master branch. Wasn't is supposed to just get my remote files and put them in my "online" local branch? If not, how am I supposed to do this? Or am I just looking at the wrong thing? Thanks! = Daniel Trezub http://www.gameblogs.com.br -- You received this message

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

2011-02-14 Thread Daniel Trezub
Ok, thanks. So, even if my remote repo is a brand-new one and my local repo is ages old with a lots of history, after the push the remote repo will have all my history? = Daniel Trezub http://www.gameblogs.com.br On 13 February 2011 23:46, Jeenu wrote: > > > On Feb 14, 5:15 a

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

2011-02-13 Thread Daniel Trezub
used-git-workflow/ Now, my question is about the remote way of live with git: when I merge/rebase to a remote/origin/master branch, git only updates my local copy of this branch, right? I should use "git push" to send the changes to the server or it'll do it automatically? Thanks a

[git-users] Re: Something wrong after simple merge

2011-02-13 Thread Daniel Trezub
Hi folks. just for the register, my problem was that I didn't have a default mergetool configured. After I installed meld and configured it properly within git, the conflicts were all solved and the merge was sucessful. Thanks :) = Daniel Trezub http://www.gameblogs.com.br On 3 Feb

Re: [git-users] Re: Doubts about Wordpress upgrade using git

2011-02-13 Thread Daniel Trezub
erver (therefore, breaking the site until the conflicts were solved). This setup avoids this. Excellent. Thanks a lot! = Daniel Trezub http://www.gameblogs.com.br On 12 February 2011 18:18, Daniel Trezub wrote: > Thanks, Thomas. > > I'll give a look at all the links you p

Re: [git-users] Re: Doubts about Wordpress upgrade using git

2011-02-12 Thread Daniel Trezub
Thanks, Thomas. I'll give a look at all the links you provided. Cheers, = Daniel Trezub http://www.gameblogs.com.br On 12 February 2011 10:32, Thomas Ferris Nicolaisen wrote: > Probably the best thing here is to see how other people do it. I don't know > much about Wordpre

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: > > > > Che

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

2011-02-11 Thread Daniel Trezub
d I use git fetch? After that, what should I do to upload my changes without risking to kill my live site? I have a branch named 'master' that is supposed to be my release branch. I think I am doing ok with my local repo and git, but the remote part is still a mystery to me. Thanks for yo

[git-users] Deleting a commit

2011-02-10 Thread Daniel Trezub
g the branch "online" itselve (it was just a test"). I've already tried rebase, reset --soft, reset --hard and some others I cannot remember, but the history just got messier :( Any idea, please? Thanks! = Daniel Trezub http://www.gameblogs.com.br -- You received this message

[git-users] Doubts about Wordpress upgrade using git

2011-02-09 Thread Daniel Trezub
y UPSTREAM branch will have the same content of the MASTER branch? I don´t quite understant rebase, sorry :S Do I have to delete all files from the UPSTREAM branch or just overwrite them? Thanks for your time and sorry for the long message. ===== Daniel Trezub http://www.gameblogs.com.br -- Yo

[git-users] Something wrong after simple merge

2011-02-03 Thread Daniel Trezub
t" help me? I don´t think so, since the bad commit is the merge one, and the good commit is the last commit after the merge. What can I do to find what´s wrong? How can I undo the merge, so I do not loose my two commits? Am I doing something wrong? Thanks for your help! = Daniel Tre

Re: [git-users] Merging workflow

2010-08-12 Thread Daniel Trezub
Hi, David I have this very same question (but I think you expressed it way better) I am trying to figure it out. If I can discover the answer, I´ll post here. Thanks. = Daniel Trezub http://www.gameblogs.com.br On 12 August 2010 11:22, David Doria wrote: > Hi all, > > I have

[git-users] Developing Wordpress plugins

2010-08-10 Thread Daniel Trezub
the feed plugin and another for the site-list plugin, so I can develop them separatedly. The problem is: I have no idea how I can keep my main wordpress installation up-to-date with the changes in both plugins, once they are tested and commited. Any ideas, tips, whatever? :) Thanks a lot