in git-svn, how do I change the svn branch that a git branch is tracking?
My normal git-svn workflow is to do my work on a local branch, then merge to master and
git svn dcommit from there to record my commits onto the svn trunk.
However, in my current local branch (
foo) I'm realizing that this work is going to be around for a while before I feel comfortable committing it to the trunk, and other developers might be involved in it before then. I would like to "back it" by a svn branch, so that my work is on the server.
I've created a new svn branch (
svnFoo) from the current trunk and I basically want to "move"
foo so that when I
svn dcommit from it all of its commits get recorded on
svnFoo instead of
What is the best way to do this?
I want to add these lines to git config. I need a command line solution. [branch master] remote = origin merge = refs/heads/master
I'm working on a project that uses git, and I am new to git myself so apologies if I get terminology/concepts wrong. Another developer joined the team who refuses to use git and maintains his own svn
I have created branch with git checkout -b mybranch. It seems that something went wrong, and now I can't delete it using git branch -D mybranch. It says: error: branch 'mybranch' not found.
I have edits to my working tree which I would like to continue working on in a branch. Will git checkout -b new_branch wipe out my current changes to the working tree? If so, how do I create a new bra
i am new to svn. i found when you merge branch A to branch B, svn moves all content in branch A to B, not copy. and when you copy branch a to branch c and when you do the same thing again, it gave you
I have recently set up an Android project on Github. Everything seems fine except for the fact that the remote tracking branch is absent from the remote tracking folder. As a result, I can't push my
The common mistake I make in git is not check on which branch I am commit changes to a wrong branch (on branch B, thinking I'm on A, commiting a change for feature A) How do I get back, and commit t
While working with git-svn, and a 'typical' svn repo /trunk, /branches/..., /tags/... How do I push a local branch to a new branch inside of /branches ?
My project (which is rather large, at ~2 million lines of code and tens of thousands of commits) is currently switching from git-svn to git. Many users have git-svn branches with history that would be
I am using SVN. I have a branch created from another branch which in turn created from trunk. Now what is the correct procedure to rentegrate my branch to trunk? -------------------------------------
I would like to know how to rename a branch specification (aka, a branch mapping) in perforce. The P4V client does not allow you to edit the branch spec name. Is it safe to just add another branch s
This question already has an answer here: How to delete a Git branch both locally and remotely? 16 answers Help me to delete git remote branch. I work with netbeans and I tried to delete remote
I'm currently working in a branch I created using the Team-->Branch. How do I use Team-->Merge to merge my changes to the branch back to head?
This question already has an answer here: Make an existing Git branch track a remote branch? 10 answers I created a new local branch and pushed it with git push origin my-branch How can I auto
After creating a branch with --track (or leaving the default, or --notrack), you later wish to be reminded of what a branch is tracking. Is there a way, other than searching through the .git/config fi
I have local branches 'master' and vam-master' which tracks remote branch 'application/master' and 'application/vam-master' respectively. $ git branch -a * master vam-master remotes/application/master
Just cloned a git repo which has (besides the master branch) a lot of development branches. How can I tell which branch it was that the latest change was made to? Most elegantly of course.
I merged a relatively old branch into master and the outcome of the merge was an unholy mess. For some unknown reason when I ran git merge it automatically took some of the out of date code that had s
I am setting my local branch to track remote branch like this: $ git branch --set-upstream foo upstream/foo But when I do git status, I get: $ git status # On branch foo # Your branch and 'upstream/f
I want to import only 1 branch from my svn repo as a git repository. So I want the contents of that branch to become the master. I don't want anything else in the repository. I also don't really want
After I did the git svn clone --stdlayout ..., everything looks good and I have converted remote branches. But when git log --graph, I don't see any branch merging graph. Is it normal?
Possible Duplicate: Deleting a badly named git branch I created a branch by mistake which starts with hyphen - , in starting character. For example git checkout -b -z/username/workname origin if I
By mistake I deleted one of my git branches. Is there any way to recover it? I used the following command: $ git push :development I want to recover this branch. I am on the master branch and it does
In an attempt to create a tracking branch I have managed to create a local branch named '-t'. I cannot delete the branch because the branch name is also a parameter. This is on a windows machine. $ gi
Such as, I have deleted the patch-1 branch in github.com, and run git fetch origin to update local repo to track the remote, but the command git branch -a still show I local repo tracking remotes/orig
I'm very new to git coming from subversion. Our techops team created an empty repo for my new project. I've been working on the project for weeks and have all the code in a folder off my C drive. I've
I have cloned an empty repository. I have an empty master branch. I need to branch out to a dev branch and start my development code there. Later I might not even need the master branch but some stabl
how to discard git local branch changes? eg, local branch with version: A->B->C Now I am on version A, and it has some changes conflict with latest version C. I want to discard local changes and
I've made several commits to a local branch, but I'm not sure what the best way to diff what I currently have to my branch's starting state. I know I can do something like git diff HEAD HEAD~6 if ther
Is there any way to annotate a branch? It would be nice to be able to do something like: $ git notes add branch-name -m'This branch is for whatever' but that of course is not terribly helpful, since
I just recently created a branch in our subversion repository. Running git-svn does not see the branch for some reason. The only thing that I can think of is that the trunk is behind the branch becaus
I have a test branch test that was created several days ago. There was a change made to a file file.py in master since then. I need to merge only this change (and nothing else) from master to test. Wh
I would like to stop tracking certain branches. I set up tracking using git branch --set-upstream foo origin/foo. How do I undo this?
Possible Duplicate: [Branch from a previous commit using git] Link to a more recent/less clear question: (Branch from a previous commit using git) I have the git branch called: jzbranch and an old c
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'm using git-svn to work with an svn repository. I have my git master branch tracking svn, and several local git branches. Is there any way to set up things so that if I run git svn rebase or git svn
I have a project in the 'trunk' folder. When I needed to create a branch, I copied the contents of the 'trunk' folder into a new 'branch' folder. As a result, the directory structure looks like this.
I have a scenario and need some inputs. I have a typical svn setup of trunk/branches/tags. However for production machine we use a release branch. The issue is : Production release branch has been mes
I was trying to track a remote branch with: $ git checkout -b --track global/master and git created a branch that is actually called '--track'+ Now when I type: $ git branch -D --track It won't dele
I tagged my master branch with a git tag -a 1.0.0 and I would like to do is reset my master branch with reset --hard to the commit that the tag points to. My questions. How to find out the commit id
I have a bare repo that was cloned from git.drupal.org. I have cloned from this bare repo to various different websites. From each of these, I push a site-specific branch onto the bare repo. E.g. if
I just accidentally typed git branch -- merged instead of git branch --merged and now when I type it correctly, I see a new merged-in branch called merged. I'm not sure if this is a feature of git
In git, how can I checkout out the HEAD version of my remote/tracking branch? Basically, I want to do a 'svn checkout ' in git. I think the closest thing I find is 'git fetch', but from the man page,
Say I have these git branches: master branchone I want to do this, keeping all history intact: master -> oldmaster branchone -> master
I followed this post on how to create and checkout a branch using git svn so that the branch was actually created on the svn repos. This worked great. When I was done with my branch, I did a checkout
Possible Duplicates: How do I push amended commit to the remote git repo? Undoing a git push Hi, I've deleted some commits from my master branch by using git reset --hard SHA_VALUE I have, however
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?
I have two local git branches that track two remote svn branches. I had those setup in a way that master was tracking the svn trunk and 'branch' tracked the svn 'branch'. recently I was doing some loc
Here's an example: >git status # On branch master nothing to commit (working directory clean) >git checkout -b test-branch >vi test.c >git add test.c >git commit -m modified test.c &g
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