pull | 易学教程

Using Git how to merge a subtree from remote branch

阅读更多关于 Using Git how to merge a subtree from remote branch

问题 Subtrees in Git work nicely although some git commands remain to be supported for subtrees. Here's the question: How to make the subtree pull from a different remote branch like "stable" or "integrate"? FYI, we have a subtree "push" working as a script. In fact, it can even push the subtree to the specific branch of our choice on the remote repository. Does anybody know how to do the reverse on a pull or even have a clue? The simple pull works like this: git pull -s subtree remotebranch One

Git subtree - subtree up-to-date but can't push

阅读更多关于 Git subtree - subtree up-to-date but can't push

I am using Git subtree with a couple of projects that I am working on, in order to share some base code between them. The base code gets updated often, and the upgrades can happen in anyone of the projects, with all of them getting updated, eventually. I have ran into a problem where git reports that my subtree is up to date, but pushing gets rejected. For example: #! git subtree pull --prefix=public/shared project-shared master From github.com:**** * branch master -> FETCH_HEAD Already up-to-date. If I push, I should get a message that there is nothing to push... Right? RIGHT? :( #! git

How can I pull an existing heroku app to new location for development?

阅读更多关于 How can I pull an existing heroku app to new location for development?

问题 I currently have the latest version of my code on another computer that I want to develop from (Home computer and laptop for when I'm out and about) I set up heroku for my app on my laptop. Now I need to associate my code on my desktop so that I can push to heroku from there as well. This is what I get from my desktop: desktop:~/NetBeansProjects/onlinescheduler$ git pull heroku master fatal: 'heroku' does not appear to be a git repository fatal: The remote end hung up unexpectedly I can't do

How can I generate a git diff of what's changed since the last time I pulled?

阅读更多关于 How can I generate a git diff of what's changed since the last time I pulled?

问题 I'd like to script, preferably in rake, the following actions into a single command: Get the version of my local git repository. Git pull the latest code. Git diff from the version I extracted in step #1 to what is now in my local repository. In other words, I want to get the latest code form the central repository and immediately generate a diff of what's changed since the last time I pulled. 回答1: You could do this fairly simply with refspecs. git pull origin git diff @{1}.. That will give

When will `git pull --rebase` get me in to trouble?

阅读更多关于 When will `git pull --rebase` get me in to trouble?

I understand that when I use git pull --rebase , git will re-write history and move my local commits to occur after all of the commits in the branch I just pulled from. What I don't understand is how this would ever be a bad thing. People talk about getting in to trouble with git pull --rebase where you can end up with a branch that other people can't pull from. But I don't get how that's possible since all you're doing is replaying your local, not-yet-public, commits on top of the branch you pulled from. So, what's the problem there? VonC It is only an issue if you have only published (pushed

MongoDB pull array element from a collection

阅读更多关于 MongoDB pull array element from a collection

问题 I have a mongodb object as follows: array ( '_id' => new MongoId("4cc97fb0247ae8747ec5fefb"), 'posts' => array ( 0 => array ( 'comment' => 'Eamorr', 'fromUname' => 'Eamorr', 'time' => 1288273840, 'UTC' => '2010-10-28T14:50:40+01:00', 'ip' => '127.0.0.1', 'id' => '123lasdfiqwoei28asdf', ), 1 => array ( 'comment' => 'Hello', 'fromUname' => 'Eamorr', 'time' => 1288277023, 'UTC' => '2010-10-28T15:43:43+01:00', 'ip' => '127.0.0.1', 'id' => 'qopqwier982389qwfa', ), 2 => array ( 'comment' => 'Hello'

How can I make my local repository available for git-pull?

阅读更多关于 How can I make my local repository available for git-pull?

I have a working copy repository that I've been working in no problem; the origin for this repository is on GitHub. I'd like to make my working copy repository available as the origin for my build machine (a VM on another physical host), so that commits I make to my working copy can be built and tested on the build machine without having to go via GitHub first. I already have a build for the GitHub repository going, but I'd like this to be a "golden" repository/build; i.e., if something goes in there, the build against GitHub should be guaranteed to pass. I've looked at the documentation on

git pull from master into the development branch

阅读更多关于 git pull from master into the development branch

问题 I have a branch called dmgr2 (development) and I want to pull from the master branch (live site) and incorporate all the changes into my development branch. is there a better way to do this? here is what I had planned on doing, after committing changes: git checkout dmgr2 git pull origin master this should pull the live changes into my development branch, or do I have this wrong? 回答1: The steps you listed will work, but there's a longer way that gives you more options: git checkout dmgr2 #

What is the difference between pull and clone in git?

阅读更多关于 What is the difference between pull and clone in git?

问题 What is the difference between doing (after mkdir repo and cd repo ): git init git remote add origin git://github.com/cmcculloh/repo.git git fetch --all git pull origin master and git clone git://github.com/cmcculloh/repo.git I mean, obviously one is shorter, but other than that are they basically doing the same thing? 回答1: They're basically the same, except clone will setup additional remote tracking branches, not just master. Check out the man page: Clones a repository into a newly created

Git pull a certain branch from GitHub

阅读更多关于 Git pull a certain branch from GitHub

I have a project with multiple branches. I've been pushing them to GitHub , and now that someone else is working on the project I need to pull their branches from GitHub. It works fine in master. But say that someone created a branch xyz . How can I pull branch xyz from GitHub and merge it into branch xyz on my localhost ? I actually have my answer here: Push and pull branches in Git But I get an error "! [rejected]" and something about "non fast forward". Any suggestions? But I get an error "! [rejected]" and something about "non fast forward" That's because Git can't merge the changes from