git-branch

I've got a project hosted on GitHub which somebody has forked. On their fork, they've created a new branch "foo" and made some changes. How do I pull their "foo" into a new branch also named "foo" in my repo? I understand they could submit a pull request to me, but I'd like to initiate this process myself. Assume the following: Because they forked my project, both our repos share the same 'history' Although GitHub shows their project was forked from mine, my local repository doesn't have any references to this person's project. Do I need to add theirs as a remote? I don't have a branch called

I started working on my master branch thinking that my task would be easy. After a while I realized it would take more work and I want to do all this work in a new branch. How can I create a new branch and take all these changes with me without dirtying master ? VonC If you hadn't made any commit yet, only (1: branch) and (3: checkout) would be enough. Or, in one command: git checkout -b newBranch As mentioned in the git reset man page : $ git branch topic/wip # (1) $ git reset --hard HEAD~3 # (2) NOTE: use $git reset --soft HEAD~3 (explanation below) $ git checkout topic/wip # (3) You have

Lets' say I had a branch named coolbranch in my repository. Now, I decided to delete it (both remotely and locally) with: git push origin :coolbranch git branch -D coolbranch Great! Now the branch is really deleted. But when I run git branch -a I still get: remotes/origin/coolbranch Something to notice, is that when I clone a new repository, everything is fine and git branch -a doesn't show the branch. I want to know - is there a way to delete the branch from the branch -a list without cloning a new instance? Mark Longair git remote prune origin , as suggested in the other answer, will remove

Lets say we have the following situation in git: A created repository: mkdir GitTest2 cd GitTest2 git init Some modifications in the master take place and get committed. echo "On Master" > file git commit -a -m "Initial commit" Feature1 branched off master and some work is done: git branch feature1 git checkout feature1 echo "Feature1" > featureFile git commit -a -m "Commit for feature1" Meanwhile, a bug is discovered in the master-code and a hotfix-branch is established git checkout master git branch hotfix1 git checkout hotfix1 The bug is fixed in the hotfix branch and merged back into the

I have two branches: master and dev I want to create a "feature branch" from the dev branch. Currently on the branch dev, I do: $ git checkout -b myfeature dev ... (some work) $ git commit -am "blablabla" $ git push origin myfeature But, after visualizing my branches, I got: --**master** ------0-----0-----0-----0-----0 ------------------------**dev**----**myfeature** I mean that the branch seems ff merged, and I don't understand why... What I'm doing wrong? Can you explain me please how you branch off from another branch and push back to the remote repository for the feature branch? All that

git diff --no-index --no-prefix --summary -U4000 directory1 directory2 This works as expected in that it returns a diff of all the files between the two directories. Files that are added output as expected, files that are deleted also result in the expected diff output. However because the diff takes into account the file path as part of the file name, files with the same name, in the two different directories, result in a diff output with the renamed flag instead of changed. Is there a way to tell git to not take into account the full file path in the diff and only look at the file name, as

I'm trying to use git submodules for aggregating 10+ repositories into one structure for easy development. It is supposed to clone the module and checkout a branch. Instead, the module is checked out in detached head mode. git clone git@github.com:org/global-repository.git git submodule update —init cd config-framework git status $git status #HEAD detached at b932ab5 nothing to commit, working directory clean gitmodules files seems to be okay $cat .gitmodules [submodule "config-framework"] path = config-framework url = git@github.com:org/config-framework.git branch = MY_BRANCH We want the MY