[git-users] Re: Connecting Clones

2010-06-01 Thread Marek Wywiał
On 1 Cze, 07:30, ben bklo...@gmail.com wrote: I need to add that I don't have the git-daemon on the server, it's a shared host. On May 31, 10:06 pm, ben bklo...@gmail.com wrote: I've created a clone (lets call it Dev) of local project (Core), and want to create a remote repo of Dev on

[git-users] Cron and git archive

2010-06-01 Thread Alexander Zaycev
There is a script to create a backup, with the standard line: git archive --format=tar --prefix=project/ HEAD | gzip my_git.tar.gz When run manually it works fine, but cron creates a bad archive (size 20 byte). In what may be the problem? -- You received this message because you are

[git-users] Re: Connecting Clones

2010-06-01 Thread ben
Thanks Marek! That got me setup. I had a few other issues that were preventing me from pushing (namely, git was not in my $PATH for sshd (the non interactive shell). I added the path to .bashrc as well as .bash_profile, and I was able to git push. Is there a reason for not making

[git-users] Pissed at Git!

2010-06-01 Thread Trans
Looks like git just pissed away all my work for the last two months. I was doing everything like I normally do. I made my changes, committed and 'git push origin master'. Everything looked good. Git told me Everything up-to-date. But... I went over to the project's github page

Re: [git-users] Pissed at Git!

2010-06-01 Thread Dan Preston
You should be ok.  You can use the git reflog command to view the history of what you've had checked out.  You can then checkout the hash commit of your latest work again and create a branch from it.  Or alternatively you can merge that hash back to master. The (no branch) thing happens when you

[git-users] Re: Pissed at Git!

2010-06-01 Thread Trans
On Jun 1, 4:39 pm, Dan Preston danpres...@gmail.com wrote: You should be ok.  You can use the git reflog command to view the history of what you've had checked out.  You can then checkout the hash commit of your latest work again and create a branch from it.  Or alternatively you can merge

[git-users] Re: Pissed at Git!

2010-06-01 Thread Trans
Sorry, make that: $ git branch recentwork 8658a39 -- 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-us...@googlegroups.com. To unsubscribe from this group, send email to

Re: [git-users] Re: Pissed at Git!

2010-06-01 Thread Dan Preston
$ git branch recentwork 9c51d95 And I will have a branch at that point? Sorry, make that: $ git branch recentwork 8658a39 I can honestly never remember what order the branch name and hash go in so I tend to usually use the more longwinded approach. $ git checkout 8658a39 $ git checkout

[git-users] Re: Cron and git archive

2010-06-01 Thread Konstantin Khomoutov
On Jun 1, 8:45 pm, Alexander Zaycev mailof...@gmail.com wrote: There is a script to create a backup, with the standard line: git archive --format=tar --prefix=project/ HEAD | gzip my_git.tar.gz When run manually it works fine, but cron creates a bad archive (size 20 byte). In what may be

[git-users] Re: Connecting Clones

2010-06-01 Thread Konstantin Khomoutov
On Jun 1, 9:06 am, ben bklo...@gmail.com wrote: I've created a clone (lets call it Dev) of local project (Core), and want to create a remote repo of Dev on a server (Staging) with a working tree (the actual files). How do I setup the remotes so that I can push from Dev to Staging? Is this

[git-users] Re: Pissed at Git!

2010-06-01 Thread Konstantin Khomoutov
On Jun 2, 1:45 am, Dan Preston danpres...@gmail.com wrote: [...] Yeah, agreed.  It's not always immediately obvious.  It'll say Not currently on any branch. in the git commit message boilerplate as well as git status output though, so I try to keep my eyes peeled for that not being the branch

Re: [git-users] Re: Pissed at Git!

2010-06-01 Thread Dan Preston
Yes. Or `git tag recentwork 8658a39`. Or `git checkout master git merge 8658a39`. Everything Konstantin said is correct, but I just wanted to add that git tag will not get you out of the detached HEAD state, so you'll probably want to create a branch, or merge the hash into master directly,

[git-users] Re: Connecting Clones

2010-06-01 Thread ben
Ah, Thank you, thank you! This bit did the trick: https://git.wiki.kernel.org/index.php/GitFaq#Why_won.27t_I_see_changes_in_the_remote_repo_after_.22git_push.22.3F I'm the only dev, so I can make sure the remote has no changes in the working tree, but I can see now how the post-commit hook would

Re: [git-users] Re: Pissed at Git!

2010-06-01 Thread Charles Manning
On Wednesday 02 June 2010 10:40:53 Konstantin Khomoutov wrote: Also, my idea was this: I found myself in situations like this one being discussed, and my first temptation after finding the relevant top commit in the reflog always was tag that immediately, then cool down, analyse the situation

[git-users] Re: Pissed at Git!

2010-06-01 Thread Jeffrey
I see. Well, it would be nice if it gave a little warning. I think I understand why it happened now though. I was tagging some old versions that I had failed to do in the past. Not exactly sure how but that must have been why. I believe the warnings about this have been getting more and more