Can someone explain a “tracking branch” as it applies to git? Here’s the definition from git-scm.com: A ‘tracking branch’ in Git is a local branch that is connected to a remote branch. When you push and pull on that branch, it automatically pushes and pulls to the remote branch that it is connected with. Use … Read more
How do I copy all files in a directory from another branch? I can list all of the files in that directory by doing git ls-tree master:dirname I can then copy all of the files individually by doing git checkout master — dirname/filename However, using wildcards has so far been a total fail. This does … Read more
So I’ve done some work in the repository and when I’m about to commit I realize that I’m not currently on any branch. This happens a lot when working with submodules and I am able to solve it, but the process is tedious and I’ve been thinking that there must be an easier way to … Read more
I’ve finished working on a feature branch feature-x. I want to merge results back to the default branch and close feature-x in order to get rid of it in the output of hg branches. I came up with the following scenario, but it has some issues: $ hg up default $ hg merge feature-x $ … Read more
This question already has answers here: Closed 10 years ago. Possible Duplicate: What do “branch”, “tag” and “trunk” really mean? What is a trunk, branch and tag in Subversion and what are the best practices to use them? What tools can I use for Subversion in Visual Studio 2008? 9 Answers 9
Is there an option to delete a branch with TortoiseGit? I found a solution for the commandline. Is there an implementation in TortoiseGit? 3 Answers 3
I’m using Mercurial locally for a project (it’s the only repo there’s no pushing/pulling to/from anywhere else). To date it’s got a linear history. However, the current thing I’m working on I’ve now realized is a terrible approach and I want to go back to the version before I started it and implement it a … Read more
Using Git, how could I search within all files in all local branches for a given string? GitHub specific: is it possible to perform the above search across all GitHub branches? (There are several remote branches on my remote GitHub repository that ideally I wouldn’t have to bring down for this search…) 7 Answers 7
I’m pretty sure I saw somewhere in a popular Git project the branches had a pattern like “feature/xyz”. However when I try to create a branch with the slash character, I get an error: $ git branch labs/feature error: unable to resolve reference refs/heads/labs/feature: Not a directory fatal: Failed to lock ref for update: Not … Read more
I have a project hosted on GitHub. I created a branch on one computer, then pushed my changes to GitHub with: git push origin branch-name Now I am on a different computer, and I want to download that branch. So I tried: git pull origin branch-name …but all this did was overwrite my master branch … Read more
