git-branch

问题 My master branch is so different than my development branch that I would like it to just become my master branch without having to do a merge, is this possible? Seems like I could walk into a lot of work if I just try and do a merge. 回答1: If you just have one copy of the repo, you could just delete your master branch, create a new branch from your dev branch called master, but you will have to notify others that you have changed the branch if there are other copies of the repo you don't

问题 I really like git. At least, I like the idea of git. Being able to checkout my master project as a separate branch where I can change whatever I want without risk of screwing everything else up is awesome. But it's not working. Basically, my workflow is like this: Checkout stable version to a new branch to experiment with new code Make a bunch of changes - I have no intent on keeping any of this, I'm just experimenting. Look at all the stuff I changed Add all the changes to be tracked Commit

问题 I have in my git repo, a file named xyz. Coincidently, I also have a branch named xyz. Presently I am on master, but I want to checkout to branch xyz. The command to be used is simple $ git checkout xyz But this would checkout the file xyz to the present HEAD. How would I change my branch to branch xyz ? 回答1: As illustrated by commit a047faf (git 1.8.4.3+), you can also try: git checkout xyz -- (Note: the error message will be clearer with Git 2.21, Q1 2019) That would make clear that the xyz

问题 This question already has answers here : git: switch branch without detaching head (4 answers) Closed 5 years ago . I tried something like this: git branch temp to create a new branch but don't move the HEAD . But I get: # Not currently on any branch. I don't want to merge anything, I just want a new branch at the current HEAD . 回答1: You're sitting on a detached HEAD : git checkout <sha> You want to make a branch at that commit: git branch my-new-branch And now switch to that branch: git

问题 I've created lots of branches in one of our repositories. Those branches are for testing before it will be pulled to the master. Now I see lots of them on the list and they we will never use it again. How to delete those branches directly to Bitbucket? 回答1: If the branches are only local, you can use -d if the branch has been merged, like git branch -d branch-name If the branch contains code you never plan on merging, use -D instead. If the branch is in the upstream repo (on Bitbucket) you

问题 I've created lots of branches in one of our repositories. Those branches are for testing before it will be pulled to the master. Now I see lots of them on the list and they we will never use it again. How to delete those branches directly to Bitbucket? 回答1: If the branches are only local, you can use -d if the branch has been merged, like git branch -d branch-name If the branch contains code you never plan on merging, use -D instead. If the branch is in the upstream repo (on Bitbucket) you

问题 Folks, I had cloned a repo. I created a branch out of it to work on a feature by issuing the following command: git branch fix78 then I worked on that branch by git checkout fix78 I continued to make commits to this local branch. Now I wanted to push this to the repo and hence I issued the following command: git push origin master:fix78 I viewed the repo from a web browser and saw that a new branch called fix78 was created on the repo. But it did not have any of my commits that I had made.

问题 I am having an issue with Git branching. Whenever I make changes to a branch, all those changes get reflected in master branch even though I haven't invoked explicit merge command. For example, I created a "dashboard" branch git checkout -b dashboard then I have made changes in one of my file(say routes.rb) and now I switched to master git checkout master Now when I open routes.rb, i can see the changes from dashboard branch. Why? Do I have some git settings that should not be there? 回答1:

问题 I'm doing some exploratory work where I will most likely be spending 30 min on several different variations of the same task. I want to track them in git so I can jump back and forth between approaches. And if there are 3 or 6 or 9 branches, I might need some more info than the branch name to tell them apart. What is the cleanest way to attach a comment to a new branch? 回答1: You want branch descriptions: git branch --edit-description This will open up your editor and let you attach metadata

问题 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 file, to display what a branch is tracking? 回答1: Use: git branch -vv to see which branches are tracked and which are not. 回答2: Note that with git1.8.3 (April 22d, 2013), you have a new way to emphasize the upstream branch: " git branch --vv " learned to paint the name of the branch it integrates