I’m using Linux and I created keys as instructed in the github tutorial, registered them with github, and tried using ssh-agent explicitly — yet git continues to ask me for my passphrase every time I try to do a pull or a push. What could be the cause?
I feel like this question has been asked many times, but the solution is typically “I deleted the directory and re-did my work with a fresh checkout.” I did a commit and push but realized that I referred to the wrong ticket number in the commit message. So I looked on SO for a quick […]
I’m trying to clone my GitHub project using the https-URL, but it fails with an error: $ git clone https://firstname.lastname@example.org/foo/foo-private.git Cloning into foo-private… Password: error: error setting certificate verify locations: CAfile: /bin/curl-ca-bundle.crt CApath: none while accessing https://email@example.com/foo/foo-private.git/info/refs fatal: HTTP request failed What am I doing wrong?
When there’s a collison during git merge, I open a mergetool called Meld. It opens three files LOCAL, BASE and REMOTE. As I’ve read LOCAL is my local branch, BASE is common ancestor and REMOTE is the branch to be merged. Now to my question: which version of the file will be finally used? Is […]
I pulled a project from GitHub a few days ago. I’ve since discovered that there are several forks on GitHub, and I neglected to note which one I took originally. How can I determine which of those forks I pulled?
I have the following branches: master production and the following remote branches: origin/master origin/production I have a script that fetches the origin/master branch and gets the diff of what changed from my last fetch (log -p master..origin/master). Then I merge origin/master. The commits found are pushed to a code review tool. I want to push […]
I’ve got a question regarding Git basics. Basically, what does the action known as “add to the index” mean in Git? I understand it like this: If for any file git calculates SHA-1 sum then basically adding to index means that it calculates SHA-1 sum and add file to the staging area. Am I correct?
I am unable to run any commands against my remote repository at Visual Studio Team Services (VSTS) because authentication fails. I am able to do Pulls etc through VS. But only through VS. Not through GIT bash, or any other tool like SourceTree.
How can I have some debug information regarding git/git-shell? I had a problem, that user1 could clone a repository without problem, while user2 could clone only an empty one. I had set GIT_TRACE=1, but nothing useful was told. Finally, after a long trial and error, it turned out that it was a permission problem on […]
I’m trying to change my command promt in terminal. I keep getting the error: -bash: __git_ps1: command not found I’ve tried it just by typing it into the terminal as is: __git_ps1. I’ve also tried it out in the .bash_profile if [ -f ~/.git-completion.bash ]; then source ~/.git-completion.bash export PS1='[\W]$(__git_ps1 “(%s)”): ‘ fi As you […]