git-pull

问题 The following set of commands worked correctly $ mkdir carboncake $ cd carboncake $ git init $ git remote add origin gitosis@myserver.net:repositories/carboncake.git $ git pull But when i tried pull as a different user, $ mkdir carboncake $ cd carboncake $ git init $ git remote add origin mithun@myserver.net:repositories/carboncake.git $ git pull I got the following error fatal: 'repositories/carboncake.git' does not appear to be a git repository fatal: The remote end hung up unexpectedly my

问题 The following set of commands worked correctly $ mkdir carboncake $ cd carboncake $ git init $ git remote add origin gitosis@myserver.net:repositories/carboncake.git $ git pull But when i tried pull as a different user, $ mkdir carboncake $ cd carboncake $ git init $ git remote add origin mithun@myserver.net:repositories/carboncake.git $ git pull I got the following error fatal: 'repositories/carboncake.git' does not appear to be a git repository fatal: The remote end hung up unexpectedly my

问题 OS - Ubuntu 14.04 I am working on deployment using GIT webhooks for it. I have added the deployment keys to git repo and now I want to trigger the git pull origin master command when a push happens from my local repo. This is the test.php file I call via browser: <?php //echo "THis is a test file on a test repo for testing the deploy functionality using github webhooks!!!!"; echo exec('whoami'); echo exec('sh -x /var/www/proj/test/git.sh'); ?> This is the git.sh shell file: #!/bin/bash cd

问题 I have ended up with a git repository in a state I don't know how to handle, and I need some help with understanding a) what's going on, how and why the repository is in this state, and b) how I should react to it. Basically, when pulling from the remote, I end up ahead of the remote, even if I reset all changes and try again. This is what I've done: I have forked a git repository, cloned the upstream version (which I don't have write access to) and then added my own fork to the list of

问题 I've lost files added to git during "merge conflict" phase. Step by step: git pull git status Git informs me about "merge conflict", that's okay. Then I create a new file and add it to git. vi test.txt git add test.txt After that, abort merge: git merge --abort I have not found the file "test.txt" neither in directory, nor via "git fsck", nor "git reflog". Is it possible to restore the file? 回答1: What have you tried with git fsck ? see this SO question : Recover files that were added to the

问题 There has certainly been posts around for this, but I actually did a commit because I thought it was the right thing to do. So, I have two repositories, one development and one production. I had to edit something in the production because it was an urgent bugfix, and now I have three files that are newer in the production than in the development. I committed the three files on the production and tried a pull, but it told me there were merge errors. I tried copying and pasting the new files to

问题 Let's say I am on a different branch than <local-branch> , called <different-branch> . When I try to pull from a remote branch to a local branch, I do the following: git pull origin <remote-branch>:<local-branch> And, from my understanding this should pull into my <local-branch> , and not pull into <different-branch> . But, then when I check git log while I'm on <different-branch> , I see that those commits are from <remote-branch> ? How do I pull from a remote branch, into a local branch,

问题 I am having difficulty in doing a pull from origin . I keep getting: "Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details." This also applies to switching branches. I get a similar sort of message, but this does not always happen. I am using Visual Studio 2015 Update 1 and Visual Studio Team Services Git. On my machine I have a local master branch, and development branches. Every time I switch to master and

问题 I am having difficulty in doing a pull from origin . I keep getting: "Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details." This also applies to switching branches. I get a similar sort of message, but this does not always happen. I am using Visual Studio 2015 Update 1 and Visual Studio Team Services Git. On my machine I have a local master branch, and development branches. Every time I switch to master and

问题 I've been advised to avoid git pull --autostash, and instead use: git alias.pull-autostash '!git stash push && git pull --rebase && git stash pop' When there are no changes in the index or working tree, doing: $ git stash push gives: No local changes to save An additional problem is that the exit status is 0 . Any stash pop would then pop something which wasn't pushed. How do I force an empty stash to be created, like git commit --allow-empty ? 回答1: For scripting, use git stash create (which