i'm working on 2 different branches release and development. now i noticed i still need to integrate some changes that were committed to the release branch back into the development branch. the problem is i don't need all of the commit. only some hunks in certain files. so a simple git cherry-pick bc66559 does not do the trick. when...
Best to be explained at an example: I am on branch 0.58 of repository and this his how I pull: git pull origin 0.58 When I just call "git pull", I get: ip238:openlierox az$ git pull You asked me to pull without telling me which branch you want to merge with, and 'branch.0.58.merge' in your configuration file does not tell me either. ...
I have a commit in a remote+local branch and I want to throw that commit out of the history and put some of them into an own branch. Basically, right now I have: D---E---F---G master And I want: E---G topic / D master That should be both in my local and in the (there is only one, call...
I have the branch master which tracks the remote branch origin/master. I want to rename them to "master-old" both locally and remote. Is that possible? For other users who tracked origin/master (and who updated their local master branch always just via 'git pull'), what whould happen after I renamed the renamed the remote branch. Would ...
I have a repository with branches master and A and lots of merge activity between the two. How can I find the commit in my repository when branch A was created based on master? My repository basically looks like this: -- X -- A -- B -- C -- D -- F (master) \ / \ / \ / \ / G -- H -- ...
Typical usage scenario: I have master, branch_foo and branch_bar. All are up to date. Now, I do a "git checkout master" and work on a bug fix. Lets say that fix was on a tracked file that is in the same state on all branches - ie. before the fix, a diff of the file from each branch results in no differences. Is there a way to commit...
This is making me nuts. How do I find code that was deleted? I ended up finding where it was created with this: $ git log --pretty=oneline -S'some code' And that's good enough, but I was also curious to find where it got deleted, and so far, no dice. First, I tried git diff HEAD..HEAD^|grep 'some code', expanding the range each tim...
I'm using git to track a project I'm developing in Flash Builder, and I'm wondering the best way to go about having it track it, especially regarding Flash Builder generated files, Compiler generated files, and source files that aren't necessarily flex files. I had it set up to ignore all of the flash builder .project & debugging direc...
I understand the importance of using version control and I am trying to learn as much as possible so I can setup SVN for our company web development projects. Right now we all work from a single dev copy and it is messy at best. Many of our users work remotely and the dev server is on a slow internet connection. From what I have rea...
Using the OS X terminal, How an you view the contents of these files as plain text? ...
I see a commit in foo branch's log. I'd like to determine if that commit has been cherry-picked onto branch bar. If I were in a pure git environment I think the hashes would be the same, but the branch in question was pulled in using git-svn. ...
Is it possible for a git submodule to be made of several other git submodules, and the super git repo to fetch the contents for each submodule? I have tried to do this using the obvious/naive approach of creating a git repo holding several submodules. Then adding this git repo to another git repo as a submodule. Then attempting to pul...
Is there a way to configure Git to remove the dead wood from the git status command? Instead of this monstrosity: # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: README # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use ...
How do each of these vcs handle renames? I have found a lot of contradicting information stating that git tracks loc's instead of files, renames would therfefore have no meaning for it. ...
I have a single SVN repository with the following current structure: project1 branches trunk tags project2 branches trunk tags which originally had this structure: project branches trunk proj1 proj2 tags That is, the project was split into two separate "subrepositories" (or whatever you want to call that) Is there any wa...
I have several applications across sub domains on various servers Each application has its own git repository. Each application uses several shared files. Essentially, my repos overlap. How is this situation best handled with multiple editors of multiple projects? ...
I use git to keep track of changes made by our development team and committed into our central cvs-style repository. Since its cvs, it keeps track of files and not commits, making it sometimes difficult to tell exactly what files constitute the full patch for a bug fix. I just came across one and did the following: 1) trolling along, ...
My working git repository is broken, it lose track to all the files in it, i.e. $ git log fatal: bad default revision 'HEAD' $ git status ... told me that all the files are new However the .git directory does contain my objects. $ du -sh .git 34M .git $ git count-objects 4151 objects, 32692 kilobytes $ git --version...
I use a lot of local topic branches in git, and sometimes end up with dependencies between topic branches causing rebase problems. For example, with a structure like: master ---> featureA ---> featureB \--> featureC If master changes and I get (and resolve) conflicts when rebasing featureA, then afterwards rebasin...
I'm developing an open source application called GarlicSim. Up to now I've been developing it only for Python 2.6. It seems not to work on any other version. I decided it's important to produce versions of it that will support other versions of Python. I'm thinking I'll make a version for 2.5, 3.1 and maybe 2.4. So I have several ques...