Git: How to rebase one remote off another remote
I have two remote git branches (call them "RemoteA" and "RemoteB").
"RemoteB" was branched off of "RemoteA" some time in the past. After that point many commits have been applied to both branches but I now want "RemoteB" to pick up all of the commits in "RemoteA".
One idea I had was to attempt to rebase "RemoteB" based off of the latest tag in "RemoteA", but I've seen some community posts advising against that. Is this possible (any sample commands would be appreciated) and if so is it something I should even attempt?
Another idea was to create a new branch off of "RemoteA", call it "RemoteC" and manually cherry pick changes from "RemoteB" onto it. What are the best practices for this type of situation?
I want to move a file from one folder to another inside my remote machine without doing ssh (logging into the machine). Ex. like with SCP we can store a file into our remote machine without logging
When I write a command like git remote add ... Can the owner of the repository see that I added the repo? Furthermore, if I pull it, can the original owner of the repository see that I did this?
This is a follow up question of how to handle this git rebase issue?. I'm developing a new feature, so I create a new branch, like this: A--B--C--D master branch \ \-1--2--3 my feature branch But giv
In response to a question about pulling one commit at a time from a git repository, I was recommended to use git remote update instead of git fetch. I have read both man pages but cannot say I underst
I've create a clone of this repository. If I run the following command, I see that my local repo is configured to use my clone to fetch/pull, as expected. $ git remote show origin * remote origin Fetc
I am new to git. I try to move a bunch of git projects from one remote repository to another.The followings are what I want to do: get all the project and codes from aaa remote repository, use repo
I've cloned a repository Rep and created my own local branch Li. I've committed a file called task.js to the local Li branch and pushed it to the remote Li branch. Now I want to revert this
I am getting the following error when trying to pull code from heroku git $ git pull --rebase Permission denied (publickey). fatal: Could not read from remote repository. Please make sure you have th
I want to use git to manage my development, integration test and production environments. I've looked around but can't seem to find a simple explanation of how (eg Git - pushing to remote repository d
I have two branches, master and mybranch in a git repository. In a local folder cloned from the git repository before adding the second branch, I can only see the first branch, as expected: xxx$ git b
I am new to git. I just did git init to initialize my folder as git repo and then added a remote repository using git remote add origin url. Now I want to remove this git remote add origin and add a n
My problem is related to Fatal Git error when switching branch. I try to fetch a remote branch with the command git checkout -b local-name origin/remote-name but I get this error message: fatal: git
I made a mistake when I rebase to a recent commit. ( I forgot to git fetch --all first, then rebase), and I've committed and pushed to the remote branch since. Now I did the rebase properly by fetch
Is it possible to delete a remote branch with hg-git? I can delete the tag locally (hg bm -d old-branch), but it's not obvious how to tell the git server to do the same.
I am setting up a remote repo that needs to house both a staging version of my code and a production version of the code (each branch will be deployed to their designated servers for testing / product
This question already has an answer here: Hg: How to do a rebase like git's rebase 4 answers Is there a Mercurial equivalent of git pull --rebase?
How can I use /home/username/www/example.git with remote add command? if I use this: git remote add origin firstname.lastname@example.org:/home/user/www/example.git git push origin master I got this error: error
All the remote branches are visible as remotes in my local git repository after a git fetch. How to selectively remove the remote branches in my local repository(not in the remote repository).
I created a local branch which I want to 'push' upstream. There is a similar question here on Stack Overflow on how to track a newly created remote branch. However, my workflow is slightly different.
I have a git repository that has a remote set up (git fetch works), but it doesn't have any remote branches: the .git/refs/remotes folder doesn't exist, and git branch -r returns nothing (empty
i was wondering if there is a chance to have localy a TFS 11 installation and remotely git(bitbucket). TFS 11 has all i need to do my work. But i want the projects on bitbucket for remote access if ne
I inherited a remote repository but every time I wish to access the remote(push/pull) I'm always asked for the user and password. I'd like to add authentication details to the repo so as not to authen
I'm at my wit's end here with a git-to-svn setup I just created. I've setup a repository with two remote repos, one svn based and the other a remote git: svn-remote.svn.url=https://subversion.acme.com
I have two hashes and an URL of a git remote repository. How to perform a diff? With SVN I do it this way: svn diff -rXXX:YYY svn+ssh://host/path
We have a repo A hosted at http://github.com/A.git. What I want is create a new repo http://github.com/B.git, then copy all contents from A.git to B.git, including all branches and tags.
I'm a git noob so this might look like a silly question. I have local & remote git repositories. I want to sync my local repository with remote repository so that my local repository becomes 100%
I have an issue: while git pushing I've got an error: Fetching remote heads... refs/ refs/tags/ refs/heads/ updating 'refs/heads/master' from 5c797ac9a561aef9c1955ba7d3f566e9474454a7 to f57849e2e68454
I'd like to have a list of all branches with an info about what do they track. I.e.: $ git branch -a -??? master <-> origin/master new_menu <-> origin/feature1 remotes/origin/master remote
I have a relatively large collection of remote branches from an old remote repo: $ git branch -r guy/feat1 guy/feat2 guy/feat3 guy/feat4 guy/feat5 guy/feat6 guy/feat7 guy/feat8 origin/HEAD origin/mast
As we consider moving from SVN to git at work, a coworker has raised the concern that a malicious or accident-prone developer could use git rebase to delete remote history from our shared repo. Edit:
I have a small problem at work. We commit all the different projects to different remote repositories and sometimes people get confused by the names they create at 4 in the morning high on caffeine. S
I have a remote location I want to use as GIT repository. I have SSH access to that location and can copy files there. I can't install or run the GIT executables on the remote location. Can I (and how
I have trouble understanding how submodules work. I have a remote repository PARENT and a remote repository CHILD. I would like to make repository CHILD a submodule of repository PARENT, so when I ch
So I'm using git-svn to keep in sync with our main svn repo. I also have created a remote git repo to push branches for safekeeping off of my machine until the changes are ready to be merged into svn.
I have set up some remote tracking branches in git, but I never seem to be able to merge them into the local branch once I have updated them with 'git fetch'. For example, suppose I have remote branch
I did a git svn rebase to merge in remote changes and get a conflict. Resolved the conflict manually and tried git rebase --continue, however it didn't let me do it. Then I found this: If it complain
I have a contributor to my github repository who has a fork and is working on a branch. I want to pull their branch to my own branch and make modifications, but still track theirs. Can I configure git
Please help me understand how git works. I clone my remote repository on two different machines. I edit the same file on both machines. I successfully commit and push the update from the first machine
I'm trying with git remote add /home/sas/dev/apps/smx/repo/bak/ontologybackend/.git bak fatal: '/home/sas/dev/apps/smx/repo/bak/ontologybackend/.git' is not a valid remote name I'm trying to sync two
Does anybody know how to easily undo a git rebase? The only way that comes to mind is to go at it manually: git checkout the commit parent to both of the branches then create a temp branch from ther
I managed to create a little mess in my local git repository. I was trying to fix a broken commit by using the following instructions. Before running the git commit --amend (and after the git rebase
I forgot what my git remote username was that I used to clone the remote to local many months ago. Now I need to set up another local environment and need to clone it using my username. How do I find
I want to make an app to control another app on another device like Keynote and Keynote Remote. How can I connect them with simple passcode and send messages easily? If there is a useful framework or
I just want to commit local branch, and not push to remote. Then I can merge updates from remote branch. When push to remote, I can selectively avoid push this specific commit to remote, and others co
I have a big git folder that contains all of my programming studies. Sometimes I have to clone a remote git folder into this big folder, thus creating a git working directory within another one. I act
In Eclipse the import command would accept a URI but in Android Studio import only seems to accept the location of a directory on my hard drive. How should I clone my remote repository with Android St
How can I combine 1st commit with 4th commit in git using 'git rebase'. From what I read here http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html, the 'squash' command in 'git r
How does git svn fetch work? Where is that branch which is fetched so that I can merge or rebase with my master or other branch? Where is the data fetched because git remote doesn't give me anything o
I am new to Git and trying to figure this out. I have cloned a remote repository, say ssh://repo to my local machine. After cloning, I edited some files, during which time the remote repository was a
I am rebasing in git and am encountering many conflicts. I address each one and do git rebase --continue, only to be met with the next conflict. How can I see how close I am to successfully completing