git-pull

问题 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

问题 I would like to know if my local repo is up to date (and if not, ideally, I would like to see the changes). How could I check this without doing git fetch or git pull ? 回答1: Try git fetch --dry-run The manual ( git help fetch ) says: --dry-run Show what would be done, without making any changes. 回答2: git remote show origin Result: HEAD branch: master Remote branch: master tracked Local branch configured for 'git pull': master merges with remote master Local ref configured for 'git push':

问题 I want to push several single commits to a git remote repo. I followed Geoff's answer found here to do so: How can I pushing specific commit to a remote, and not the previous commits? The commits I want to push are not at the head, so I have to reorder the commits using rebase first and I used these instructions to do so: http://gitready.com/advanced/2009/03/20/reorder-commits-with-rebase.html Essentially I've done: git clone git commit git commit ... git pull git rebase -i HEAD~3 git push

问题 I want to push several single commits to a git remote repo. I followed Geoff's answer found here to do so: How can I pushing specific commit to a remote, and not the previous commits? The commits I want to push are not at the head, so I have to reorder the commits using rebase first and I used these instructions to do so: http://gitready.com/advanced/2009/03/20/reorder-commits-with-rebase.html Essentially I've done: git clone git commit git commit ... git pull git rebase -i HEAD~3 git push

问题 Moderator Note: Given that this question has already had sixty-seven answers posted to it (some of them deleted), consider whether or not you are contributing anything new before posting another one. What are the differences between git pull and git fetch ? 回答1: In the simplest terms, git pull does a git fetch followed by a git merge . You can do a git fetch at any time to update your remote-tracking branches under refs/remotes/<remote>/ . This operation never changes any of your own local

问题 This is my .git/config configuration file in my repository: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = git@github.com:<username>/<repository>.git fetch = +refs/heads/*:refs/remotes/origin/* [user] name = <username> I have correctly configured my public ssh key in github. I pushed my changes into this repository from another machine, which where correctly updated into github. However in my current machine, when I make a git

问题 I know the difference between git fetch and git pull . git pull is basically a git fetch + git merge in one command. However, I was researching on how to update my fork (master branch) with the upstream without checking out the master branch . I came across this SO answer - Merge, update and pull Git branches without checkouts But when I used git fetch upstream master:master after I was already checked out on master, I ran into this error - fatal: Refusing to fetch into current branch refs

问题 I've been tasked with maintaining a Jenkins server with jobs that basically check out some code and build it. Currently they do a git clone using the "--depth 1" and "-b {branch}" options to get a specific code branch as quickly as possible. But this is still wasteful since a fresh copy is being checked out (over the network) every time a job executes, even if there are very few (if any) changes. Instead, what I'd like to do is have a shared local repo on the build machine that's a clone of

问题 I have a remote tracking branch tracked locally in my local repository using 'git branch -b branch-name origin/branch-name'. My remote branch is test2/test2 (origin/branch-name) which is being tracked locally as test2. The origin is also named test2. I haven't checked-out my local tracking branch test2. When i do a 'git pull origin remote-branch:local-tracked-branch' i get this error [test2]$ git pull test2 test2:test2 From /gitvobs/git_bare/test2 ! [rejected] test2 -> test2 (non fast forward

问题 I am working in a project with three more collaborators, my case is: Every time I try to add a new commit and there is some change in the remote (even though it is a file that I have not worked in local), I get the following message that forces me to create a merge with following default message: error: failed to push some refs to 'https://work.git.beanstalkapp.com/app.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused