version-control

问题 I started using Core Data for iPhone development. I started out by creating a very simple entity (called Evaluation) with just one string property (called evaluationTopic). I had following code for inserting a fresh string: - (void)insertNewObject { // Create a new instance of the entity managed by the fetched results controller. NSManagedObjectContext *context = [fetchedResultsController managedObjectContext]; NSEntityDescription *entity = [[fetchedResultsController fetchRequest] entity];

问题 I'm working on a local branch "BDD-local" and would like to get the changes from other developers. The other developers are using their own branch and once they are happy with the unit tests, they push the changes to remote repo (origin/master). I was going through several posts here and getting conflicting information. Few people talk about using: git fetch origin git merge origin/master Some others think, 'git pull' should get the changes. One of our developers asked to use 'git merge

问题 I'd like to rebase to a specific commit, not to a HEAD of the other branch: A --- B --- C master \ \-- D topic to A --- B --- C master \ \-- D topic instead of A --- B --- C master \ \-- D topic How can I achieve that? 回答1: You can avoid using the --onto parameter by making a temp branch on the commit you like and then use rebase in it's simple form: git branch temp master^ git checkout topic git rebase temp git branch -d temp 回答2: You can even take a direct approach: git checkout topic git

问题 I am new to both git and version control so I am trying to figure out what a patch is and how is it different from the rest of activities I do in git? When do I apply a patch? Does it happen every time I commit? 回答1: You can see in this blog post how you can create a patch (collection of changes you want to communicate and apply to another repo) (picture from the 2008 blog post "Bioruby with git: how would that work?", published by Jan AERTS) See also Contributing to Rails with Git as another

问题 I'd like to rebase to a specific commit, not to a HEAD of the other branch: A --- B --- C master \ \-- D topic to A --- B --- C master \ \-- D topic instead of A --- B --- C master \ \-- D topic How can I achieve that? 回答1: You can avoid using the --onto parameter by making a temp branch on the commit you like and then use rebase in it's simple form: git branch temp master^ git checkout topic git rebase temp git branch -d temp 回答2: You can even take a direct approach: git checkout topic git

问题 This question already has answers here : How to modify a specified commit? (16 answers) Closed 5 years ago . I have made 3 git commits, but have not been pushed. How can I amend the older one (ddc6859af44) and (47175e84c) which is not the most recent one? $git log commit f4074f289b8a49250b15a4f25ca4b46017454781 Date: Tue Jan 10 10:57:27 2012 -0800 commit ddc6859af448b8fd2e86dd0437c47b6014380a7f Date: Mon Jan 9 16:29:30 2012 -0800 commit 47175e84c2cb7e47520f7dde824718eae3624550 Date: Mon Jan 9

问题 I've been wondering if there's an easy way to push and pull a local branch with a remote branch with a different name without always specifying both names. For example: $ git clone myrepo.git $ git checkout -b newb $ ... $ git commit -m "Some change" $ git push origin newb:remote_branch_name Now if someone updates remote_branch_name, I can: $ git pull And everything is merged / fast-forwarded. However, if I make changes in my local "newb", I can't: $ git push Instead, I have to: % git push

问题 When I do git diff COMMIT I see the changes between that commit and HEAD (as far as I know), but I would like to see the changes that were made by that single commit. I haven't found any obvious options on diff / log that will give me that output. 回答1: To see the diff for a particular COMMIT hash: git diff COMMIT~ COMMIT will show you the difference between that COMMIT 's ancestor and the COMMIT . See the man pages for git diff for details about the command and gitrevisions about the ~

问题 We are new to git, and I want to set a tag at the beginning of our repository. Our production code is the same as the beginning repository, but we've made commits since then. A tag at the beginning would allow us to "roll back" production to a known, stable state. So how to add a tag to an arbitrary, older commit? 回答1: Example: git tag -a v1.2 9fceb02 -m "Message here" Where 9fceb02 is the beginning part of the commit id. You can then push the tag using git push origin v1.2 . You can do git

问题 What are the branching characteristics of TFS? Early Branching/Heavy Branching If we look at the tools Perforce, Subversion, CVS, for instance, we see that branching is taking a copy of the trunk. It is "early branching" all of the files which are defined to be branched, irrespective of whether those files are changed in that branch. This methodology starts creating new versions of files, at the time the decision to create a branch is made, for the entire tree of files. One of the biggest