git-branch

This is a common use-case for me, I clone a repository, checkout a branch, do some code changes, make multiple commits, then when its stable, i do a push to remote, eventually the branch gets merged and deleted. and I'm left with a local branch with upstream gone. I was looking for a safe way of deleting all such branches. from the description, it seemed like git remote prune origin is doing this exactly. But it doesn't seem to be working for me. Seeing the following behaviour, the branch encrdb_init has been deleted from remote but the git remote prune origin command does not seem to prune it

I am planning to rename a branch in my git repository. I found out that the easy way to do that is to make a new branch from that branch and give it the desired name. After that I want to delete the old branch (the parent). But I'm afraid that I will lose data in my new branch if I do that. What happens with the commits originally made to the parent branch if I delete that branch? VonC What happens? nothing. If you create a branch where another is, you can "delete" that other branch without losing anything. A branch (HEAD) is just a pointer to a commit. As long as those commits are referenced

I'm getting my feet wet with git tagging, but my previous background is in Subversion, where "tags" were really just copies, not "real" tags... If I add a tag to a git repo, is it applied to all branches or only the current one? For example, if I currently have these branches ( git branch -v ): * master deadbeef My master head comment dev baddfeed My def head comment And the currently checked out branch is master, as you can see. Now suppose I git tag -a TAGNAME , does TAGNAME apply only to deadbeef (master branch) or to baddfeed (dev branch) as well? e.g., Say I subsequently switch to the dev

The GitHub web interface has a nice feature telling me whether a branch is even with the master branch. Is there a command-line equivalent of this feature? I work with multiple repositories and I'm looking for a quick way to see whether branches are even or require attention. Here are screenshot of the GitHub web interface, for those wondering about this feature: To compare the files of a branch called branch located on GitHub against master on the same repository, you can use git diff : git diff origin/branch origin/master The following will work to compare the commits between the two

There are a bunch of files in my project that are sometimes modified but always shared among many different branches. Examples include build scripts, batch files that include paths, etc. Even the .gitignore file itself is an example. I want this stuff in source control, but I don't want individual branches to keep track of changes to them. How do you handle this situation? Do you track everything related to your project in Git? What's your approach to shared objects? Is .gitignore my only option? Keep your build scripts and batch files in a separate repo? Instead of relying on submodules, have

G---H // Release Branch / / A---B---E---F--- // master \ \ C---D--- // bug fix branch Based on our particular needs for our project, it is quite common for the above scenario to occur. We have our master/dev branch with some commits. Then we get a bug report and start fixing that on the bug branch (commits C and D above). More commits happen in the dev branch in the meantime. Next we are told we need to create a release for a customer which cannot include the changes introduced by commits B, E and F above, but it should include the bug fix. So we branch off of dev before change B was ever