git-branch

WHAT I WANT TO DO I have a file which contains sensitive datas so I don't want to push content of this file to remote server. WHAT I DID? To achieve this, I made a commit when the file was empty and pushed this empty file to server (GitHub). And then fill the file with sensitive datas and applied git update-index --skip-worktree path/to/file . But I didn't made any commit. Now I'm trying to switch my branch but I'm getting this error : error: Your local changes to the following files would be overwritten by checkout: path/to/file Please, commit your changes or stash them before you can switch

If I have n git branches, how do I easily show the relationship between these branches? Basically I am interested in seeing a tree of a subset of all the branches in my repository. I am however not interested in all the intermediate commits. E.g.: My repository looks like this: o---o--o A / / o--o--o--o--o--o B \ \ \ \ o--o C \ \ \ \ o--o--o--o--o--o D But probably way more complicated. Now I want to see the relationship between branch A, C and D. Something along the lines of: o A / o--o--o \ \ o---o C \ o--o D Or an equivalent overview. Is this possible, and how? (A graphical tool will be

I'm trying to push a new local branch product-0.2 to remote where there is already a tag with the same name (but the branch itself does not exist) git push -v --tags --set-upstream origin product-0.2:product-0.2 Pushing to https://****@github.com/mycompany/product.git error: src refspec product-0.2 matches more than one. error: failed to push some refs to 'https://****@github.com/mycompany/product.git' Same with: git push origin product-0.2:/refs/heads/product-0.2 Although the other way around it works, e.g. create a branch product-0.1 , commit on it then apply a tag product-0.1 . Some people

From the man page: Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "remotes/<name>". So I removed a bunch of branches using git push origin :staleStuff and then ran git remote prune origin However, only one single local branch was pruned. Some of these branches were created by me, some by co-workers. Does this indicate that I wasn't tracking those branches correctly in the first place? When you use git push origin :staleStuff , it automatically removes origin

We would like to enforce a new policy for our projects that the master branch now be called the release branch to ensure it is more clear as to how the branch should be used. Naturally, we will have develop and release candidate branches as well. I understand I can rename the master branch locally by simply using the following: git branch -m master release However, that is only locally. Even if I push this up to the remote, the HEAD still points to the remote master branch. I want to get rid of the master branch completely and make the default local branch upon initial clone, be release. How

I'm more of a novice when it comes to advanced operations in git. I maintain my blog using the blogging framework Octopress . Though Octopress is not under any development since 2011, it serves my purpose well and so I haven't thought of changing anything so far. FYI, my blog is hosted on Github Pages. Today, while working on a new post, git status showed the following message: On branch source Your branch is based on 'origin/master', but the upstream is gone. (use "git branch --unset-upstream" to fixup) The same message repeated for all the subsequent commands such as git add . , git commit