git-branch

Alright, lets say one day we make happen to make a bunch of modifications and when we go to commit them we notice we were working on the wrong branch. How can we force git to switch branches without discarding local changes . I'm probably going to go about this in a naive way while I wait a reply, but I would like to know if theres a correct procedure as I'd be lying if I said this hasn't happened to me before... Backup changed repo git reset --hard git checkout right-branch Restore changes git commit -m "changes" There are a bunch of different ways depending on how far along you are and which

We have a Git repository with over 400 commits, the first couple dozen of which were a lot of trial-and-error. We want to clean up these commits by squashing many down into a single commit. Naturally, git-rebase seems the way to go. My problem is that it ends up with merge conflicts, and these conflicts are not easy to resolve. I don't understand why there should be any conflicts at all, since I'm just squashing commits (not deleting or rearranging). Very likely, this demonstrates that I'm not completely understanding how git-rebase does its squashes. Here's a modified version of the scripts I

git branch -a shows both remote and local branches. git branch -r shows remote branches. Is there a way to list just the local branches? Just git branch without options. From the manpage: With no arguments, existing branches are listed and the current branch will be highlighted with an asterisk. just the plain command git branch shortduck git branch -a - all branches. git branch -r - remote branches only. git branch -l or git branch - local branches only. If the leading asterisk is a problem, I pipe the git branch as follows git branch | awk -F ' +' '! /\(no branch\)/ {print $2}' This also

Is it possible to commit a file in a git branch with out checking out that branch? If so how? Essentially I want to be able to save a file in my github pages branch without switching branches all the time. Any thoughts? Update: It's not possible to do what I want (see comments below for use case). What I ended up doing is programmatically cloning my current directory to a tmp directory, then checking out my branch in that tmp directory (doesn't affect my working directory) and committing my files to the tmp directory clone. When I'm done, I push back to my working directory and delete the tmp

I've used git-blame to find a particular commit. Now I want to find the branch that it originally came from. (From there, I'll use the branch name to find the particular ticket) Let's define "original branch" as "the branch to which the commit was made before the branch was merged into any other branch". Like the others said, if the branch you are looking for isn't local to the repository on which you are blaming this commit (e.g. a branch only in the personal repo of a distant developer), you are screwed. But assuming that sought-after branch is something you can see, and that of course you

I am currently working on ClearCase and now migrating to GIT. But we need this migration in a way that all work will be done in GIT and the data will be synced backed to ClearCase stream. We will have the same branch names and stream names in both GIT and CC, so scripting shouldn't be a problem. The problem here is, Can someone suggest which is the best model to sync CC and GIT Have all the Vobs in CC as single repo in GIT, and have the major stream in CC as various branches in GIT. - Single GIT repo (VOBS) and many branches (CC streams). - This takes up less space as VOBs are kept as single

How do I pull all of the remote branches to my own repository? if I type: git branch -a I get a long list of branches, but if I type: git branch I see only 2 of them. How do I pull ALL branches into my local list? I know I can do: git checkout --track origin/branch-name but that pulls and checks out only one branch at a time. Any way to get it all done at once without that whole tedious work of running git checkout --track origin/branch-name over and over and over again? ps. I tried following commands, none of them made remote branches appear in my git branch list: git fetch --all git remote

I made a mistake, and started making commits "to the last tag", which lands my commits in "no branch". They should have been applied at the head of an already existing branch. I have not pushed my changes yet. I've found a few other question for when commits are in the wrong branch, but now I have no branch, so I don't know how to handle this. Preferably, I would like to erase my mistake entirely, and "move" my changes to the end of the right branch. If I must leave my mistake in the history, I need to merge them in atleast. You are currently in a detached HEAD state. To resolve that, all you