Re: [git-users] Re: how to to check if a branch has changes not present in master?

2012-08-29 Thread Fred
On Wednesday, August 29, 2012 4:11:23 AM UTC+2, Michael Wang wrote: > > I have tried git diff master... which also have this issue, the > cherry-picked change is showing in the output. You are right. that's because the way it works. it finds last commit in master where branchB was forked and

[git-users] push error

2012-08-29 Thread ashu
What can be the reason of this error ? ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ sudo git init [sudo] password for ashu: Initialized empty Git repository in /home/ashu/Documents/git-dir/git1/.git/ ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ git commit -m "first commit" fatal: Unable to crea

Re: [git-users] push error

2012-08-29 Thread Michael Wang
the "git commit" has warned you "nothing to commit (create/copy files and use "git add" to track)" and if you try git log, you will get someting like: fatal: bad default revision 'HEAD' git cannot commit an empty tree, so you should add at least one file for git to track, try the following command

Re: [git-users] push error

2012-08-29 Thread ashutosh verma
It is still giving the same error: ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ touch README ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ echo 'Hello world' > README ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ sudo git add README [sudo] password for ashu: ashu@ashu-G41MT-S2P:~/Documents/git-di

Re: [git-users] push error

2012-08-29 Thread Michael Wang
No, this time is another error "fatal: remote origin already exists." you have already add that remote. No need and you cannot add it again. just run "*sudo git push -u origin master" * 2012/8/29 ashutosh verma > It is still giving the same error: > > ashu@ashu-G41MT-S2P:~/Documents/git-dir/git

Re: [git-users] push error

2012-08-29 Thread Ryan Hodson
I believe the 403 error is a GitHub permissions issue. I don't think you can push over https without some special setup. The easy solution is to use SSH instead. Try changing your remote to: ssh:// github.com/ashutoshverma/drunken-ironman.git On Aug 29, 2012 4:11 AM, "Michael Wang" wrote: > No,

Re: [git-users] push error

2012-08-29 Thread Martin Møller Skarbiniks Pedersen
On 29 August 2012 10:43, ashu wrote: > What can be the reason of this error ? > > ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ sudo git init > [sudo] password for ashu: > Initialized empty Git repository in /home/ashu/Documents/git-dir/git1/.git/ > ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ gi

[git-users] key authentication error

2012-08-29 Thread ashu
*Any one can tell me reason of this error : **[root@localhost git1]# git push -u origin master Permission denied (publickey). fatal: The remote end hung up unexpectedly whereas I have the result of the key verification command is follow : [root@localhost git1]# ssh -vT g...@github.com OpenSSH_

Re: [git-users] key authentication error

2012-08-29 Thread Konstantin Khomoutov
On Wed, 29 Aug 2012 04:30:45 -0700 (PDT) ashu wrote: > *Any one can tell me reason of this error : > > **[root@localhost git1]# git push -u origin master > Permission denied (publickey). > fatal: The remote end hung up unexpectedly > > > whereas I have the result of the key verification comma

Re: [git-users] push error

2012-08-29 Thread Konstantin Khomoutov
On Wed, 29 Aug 2012 04:15:57 -0500 Ryan Hodson wrote: > I believe the 403 error is a GitHub permissions issue. I don't think > you can push over https without some special setup. The easy solution > is to use SSH instead. [...] I beleive there's no any way to push over HTTPS to github. -- You

Re: [git-users] push error

2012-08-29 Thread Konstantin Khomoutov
On Wed, 29 Aug 2012 01:43:22 -0700 (PDT) ashu wrote: > What can be the reason of this error ? > > ashu@ashu-G41MT-S2P:~/Documents/git-dir/git1$ sudo git init > [sudo] password for ashu: > Initialized empty Git repository > in /home/ashu/Documents/git-dir/git1/.git/ > ashu@ashu-G41MT-S2P:~/Docum

Re: [git-users] Re: how to to check if a branch has changes not present in master?

2012-08-29 Thread Michael Haggerty
On 08/28/2012 04:51 PM, Fred wrote: > git rev-list ist great, but it doesn't work for cherry picked commits > > do a cherry-pick commit from branchB into master. git rev-list > master..branchB would show sha1 of the commit in branchB. > But the change itself is already in master (cherry-picked and

Re: [git-users] git branching

2012-08-29 Thread Konstantin Khomoutov
On Tue, 28 Aug 2012 12:44:19 -0700 (PDT) git newbie wrote: > For a more complicated development environment where there is a > master branch, a devel branch off of master, and feature branches off > of devel, how do you create a feature branch so that it's parent is > the devel branch and not the

Re: [git-users] Using a mergetool that is not in the list of mergetool candidates.

2012-08-29 Thread Konstantin Khomoutov
On Tue, 28 Aug 2012 14:53:43 -0700 (PDT) stantona wrote: > I'm following the following guide: > http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool#Comments > > which uses a bash script as the mergetool that essentially calls > vimdiff. > > After adding the script as my mergetool and then

Re: [git-users] Re: how to to check if a branch has changes not present in master?

2012-08-29 Thread Fred
On Wednesday, August 29, 2012 2:21:54 PM UTC+2, Michael Haggerty wrote: > > On 08/28/2012 04:51 PM, Fred wrote: > > git rev-list ist great, but it doesn't work for cherry picked commits > > > > do a cherry-pick commit from branchB into master. git rev-list > > master..branchB would show sha1

Re: [git-users] push error

2012-08-29 Thread Thomas Ferris Nicolaisen
On Wednesday, August 29, 2012 2:00:42 PM UTC+2, Konstantin Khomoutov wrote: > > On Wed, 29 Aug 2012 04:15:57 -0500 > Ryan Hodson > wrote: > > > I believe the 403 error is a GitHub permissions issue. I don't think > > you can push over https without some special setup. The easy solution > > is t

Re: [git-users] key authentication error

2012-08-29 Thread Mika Suomalainen
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 29.08.2012 14:30, ashu wrote: > * > > **[root@localhost git1]# git push -u origin master Permission > denied (publickey). fatal: The remote end hung up unexpectedly* You probably don't own the origin or have push access to it, if your key has be

[git-users] how to push changes to .git/info/exclude

2012-08-29 Thread git newbie
Hi, We have a remote repository that we clone from. I updated my local repository's .git/info/exclude file, but I can't seem to be able to get this pushed up to the remote repository. How do I do this? Thank you very much -- You received this message because you are subscribed to the Googl

Re: [git-users] how to push changes to .git/info/exclude

2012-08-29 Thread Ryan Hodson
The .git folder is not under revision control, so you won't be able to add the exclude file to your project, let alone push it to the remote. If you need an ignore file for the entire project, you should put a. gitignore file in the working directory and commit it like any other file. On Aug 29, 20

[git-users] Size of cloned git subtrees - only history / files for subtree needed

2012-08-29 Thread Haasip Satang
Hi all, in short the question of the lenghty explanation below will be: How can I create a clone of a subtree that only contains the data needed for that subtree in the .git folder. In detail here is what I have tried already and what my setup looks like: We are having a big repository cont