How do I extract and remove a merged branch in Git?
I have a 7 branches that affect the same files, all have been merged into the master branch through a secondary branch. One of the branches was not meant to be merged because it was not stable - can I undo the changes made by that single branch?
Assuming my repository looks like the following:
master A - B - - - - E - - G - - - J - K
b1 | `- F - - - I´
b2 | /
b3 |` - C - - - - - H -´
b4 ` - - D - - - -´
Now D is in the master. I want to remove it (but keep it in the b4 branch).
I use SmartiGit for an SVN repo and now I have this error message in SmartGit: The repository has multiple remotes defined (either Git or SVN). This kind of configuration is not supported and will re
How do I remove a Git submodule? By the way, is there a reason I can't simply do git submodule rm whatever ?
On some development branches I need to use origin/master on others I need to use origin/dev. I want to use some scripts to automate my work a little more, and I would like to know how to determine the
I want to see if you've merged my branch into your branch. But I can't just use git branch --contains, because you've rebased my branch on yours before doing the merge. Still, it seems like there ough
What are the current best practices with git branches that have been created to test out a solution to a bug and have not been merged because the review process show that they are wrong or there are b
I have several feature branches that are being automatically merged into the integration branch. I'd like to know if and when this is happening. I can type git log which will show me that a merge has
I have a git repo with a single branch: the master branch. Instead, I'd like for the master branch to be called somethingelse, that way later I can add more branches with other names. I don't want t
If I have a feature branch F and master branch M, then git branch --merged while on master will show me if F has been entirely merged into M, but how can I tell if it has EVER been merged? I've tried
Using Gerrit it is easy to accidentally merge unstable code from the develop branch into the stable branch: $ git checkout develop $ commit $ git push origin HEAD:refs/for/stable In Gerrit it isn't v
I'm not able to figure out how to remove a remote branch. I was trying to mimic the following GIT command: git push origin :branchToDelete The following code and it's variations with the empty source:
I have created a git branch for testing my demo code. I wanna delete it & but I am failed!!! $git branch -d <branch_name> What's the way to delete a local branch in git?
In C#, for an excel spreadsheet, how do I autofit a column that has merged cells? I tried doing this with the code below, but it does not autofit the column. Here is my code so far: Worksheet xlShee
In git, how do I work back from a branch head and find every commit that contains (not necessarily touches) a particular file please? The touches version is ok to write: git log mybranch -- filename
I have cloned a git repository and I would like to switch to a particular branch from the following list (e.g. branch1, branch2, branch3) Should I have to say git fetch origin branch2? How do I know t
I have commits A-B-C-D on one branch and want to merge A-B-C to another one. I know that you could do git cherry-pick one by one, and my question is whether I could group these commits together and ho
How can I merge a state before wrong commits into the current head in Git? Mistakenly merge by a other person resetted my change on the server, after I fetched and merged the remote master branch, my
Can anybody make sense of the following sequence of commands and output? What am I misunderstanding about the way Git works (or is this a bug in Git)? sbuchanan@mage:~/projects/this$ git branch master
My workflow goes like this: Create a new branch X. Do some commits Checkout to master Merge X into master But then my history looks like this: commit c37c0b495e6cede93dd359201e14af46f7d4bbaf Merge:
In my git repository, I have merged branch B into master, getting the the following structure: --> A --> B --> C --> D (branch master) | | F --> G --> H (branch B) I now want to
I have tried get the change of github repository to one repository bazaar, something like this: bzr merge email@example.com:Author/repository.git is there any way to do this?
Is there a way to pass git filter-branch a regular expression to remove files/directories permanently from the history?
I accidentally committed to the wrong branch. How do I delete that commit?
Here's the scenario. I have a series of commits in branch my_new_branch I want to push this branch up to the remote repo as a different name and track it. If I do: git push origin my_new_branch:differ
I needed to remove a couple of obsolete files from the git history, so I followed the approach of using git filter-branch ... as suggested in various questions and in the git manual. After running t
I'm a bit confused by git rebase. I have a develop branch and a staging branch. I've merged develop into staging git checkout staging git merge develop But there are a bunch of duplicate commits beca
We have a fairly large GIT repo and I would like to remove branches that were never merged back into master. The reverse is fine too - a way to list all branches that have been merged into master at s
Okay, so I added the file .gitattributes with lines like this *.css text *.js text etc... I then followed the instructions at http://git-scm.com/docs/gitattributes#_checking-out_and_checking-in $ rm
I have a Git repo with the following structure: A--B--C--D--E I’d like to separate the C commit into a branch: C / \ A--B---D--E How do I do that?
I cannot remove a remote branch called origin/featureBranch. I guess it's because the branch name starts with origin, but I am not sure: $ git branch -r | grep featureBranch origin/origin/featureBranc
I would like to generate a patch with all commits from a local branch. Without Comparing to the master. (because a part of the commits are already merged with the master.)
I've tried a few things suggested, but nothing seems to remove it. This started occurring when I upgraded to Mountain Lion OS X. Anytime I do a git pull, it displays this annoying as heck empty editor
I have this situation in our codebase. We created a branch but, mistakingly, we merged master into that a few times (which resulted in a few fast forward merges). Now we have a mix of commits done in
I'm able to see my local and remote branches colored differently with the following configuration in my .gitconfig. [color branch] current = bold cyan local = normal remote = bold red In git branch
I'm trying to find the revision number in default, from which I have merged into current branch. If there were several pulls from default, I'm interested in the latest one. Current brunch is not merg
I'm developing a git post-receive hook in Python. Data is supplied on stdin with lines similar to ef4d4037f8568e386629457d4d960915a85da2ae 61a4033ccf9159ae69f951f709d9c987d3c9f580 refs/heads/master T
how do I fetch a remote branch and update git's local ref for that branch without effecting the current branch? For example if I do this $ git pull origin master origin/master is merged into my curre
I have a master branch and would like to create a new branch based on it, and then switch to the new branch. I'm very very new to coda/github/terminal so I don't even know if my syntax is correct. her
I realize there are already questions on how to back up a repository (and the answer is usually git bundle), but I'd aiming specific setup. I'd trying to periodically commit a snapshot of the curren
The following git command... git show -s --pretty=format:%T master ...will emit the SHA1 of the current head of master. However the following MSBuild task only produces a literal 'T' <Exec Command
Using TFS, I have trunk $/project/trunk and a branch $/project/dev/feature/new_one. I have merged my branch back to trunk as follows: C33($/project/trunk) | \ | \ | C32($/project/dev/feature/new_one)
I made a mistake in a git svn dcommit and would like to undo the commit. (I was actually trying to push to a branch, but pushed to trunk instead.) How can I do this with git-svn?
for some reason hg ci --close-branch is coming up as an command not found in my mercurial. how do I get around this to close the branch in a different way? thanks!
I wanted to start working on 'feature a', so I created a new branch git checkout -b feature-a. When the feature was finished and working correctly, I merged it in master git checkout master; git merge
I'm trying to use git for our software development. I found that if I delete a branch in git, I could lose my code forever. That surprised me. I thought as a version control system, it should be able
I have a branch called develop in my local repo, and I want to make sure that when I push it to origin it's merged with the origin/master. Currently, when I push it's added to a remote develop branch.
I'm working on a lenghty merging process with several conflicts. What can I do to save the intermediate state, in order to periodically keep backups in case disaster strikes?
How can I tell git that while I want to allow git fetch on certain branches that I do not want to allow git push on those branches. In other words, I have some branches which reflect current work
I'm new to Git and a bit confused. I have Master branch and have created a second feature branch. If I make changes in my feature branch and then switch to Master, will my changes be lost if I don't
How do I remove a feature branch in mercurial if I want to remove it completely? It should be stripped from the history and I don't want to merge the changes in another branch (just throw the code awa
I am currently creating topic branches: git checkout -b topic_branch ...do work... git checkout master git merge topic_branch but currently when I do this, I lose history of my 'topic_branch' and all