You can use git cherry-pick to grab C, and put it on Y. Assuming Y exists as the tip a branch called branch-Y: $ git checkout branch-Y $ git cherry-pick C So now C is on top of Y. But D and E also still contain C (cherry picking doesn’t move a commit, it just … Read more
Try this instead of git checkout: git symbolic-ref HEAD refs/heads/develop Then you should be able to delete master.
Summary: You can use Git’s reflog to show recent movements in order of checkout: git reflog Script: Here’s a script you can download and use via git recent from inside any Git repository: https://gist.github.com/jordan-brough/48e2803c0ffa6dc2e0bd Usage: $ (master) git recent -n 5 1) master 4) deleted-branch 2) stable 5) improve-everything 3) fun Choose a branch: 2 … Read more
You can’t put a new commit into an existing tag without breaking an important Git guideline: Never(*) modify commits that you have published. Tags in Git aren’t meant to be mutable. Once you push a tag out there, leave it alone. You can, however, add some changes on top of v1.1 and release something like … Read more
When you do a push, git only takes the changes that you have committed. Remember when you do a git status it shows you the files you changed since the last push? Once you commit those changes and do a push they are the only files that get pushed so you don’t have to worry … Read more
git push origin master:fix78 pushes the local master to a remote branch called fix78. You wanted to push the local branch fix78, which has the same syntax but without the master: You can fix it by doing git push origin :fix78 to delete the remote branch and then git push origin fix78 to push your … Read more
It’s now possible to get the TFS branches to be correct Git branches if cloning using git-tfs. This is now in the stable release! You first clone not the entire repository but the trunk : git tfs clone http://<tfsurl>:8080 $/main/trunk Then you run branch –init, which creates a new branch in the Git repository git … Read more
You can set a different branch to push to a different server for individual branches by using these commands: As of Git 1.8.0: git branch –set-upstream-to origin/foo foo Note: If the last foo is left out, it will choose the current branch. As of Git 1.7.0: git branch –set-upstream foo origin/foo In your case, you … Read more
In a File Manager, Open your Project root directory (where your .git folder is found). Right click and go to: TortoiseGit > Switch/Checkout Ensure the Switch To Option to Branch. Then click the little button to the side of the drop down menu that is denoted by … A window will pop up showing the … Read more
You cannot delete the branch you are currently on. Try creating a new branch git checkout -b new-branch Then delete the develop branch git branch -d develop