One argument for using –no-metadata is that it doesn’t change your commit messages. So even if you fetch from different locations, the commit messages will be the same and thus the commit hashes will be the same. As an example, if I git svn init a repo from a local file: URL and later pull … Read more
A “forced update” means the remote-tracking branch was recent. This happens if you fetch (or pull) after someone does a force push to the repository. However, when executing the git pull, your local branch won’t lose any history. Since the remote branch’s history now diverges from your local, git pull will execute a merge. If … Read more
Using git checkout with –ours or –theirs expects at least one argument: the path(s) of the files / directories to checkout. As the manual says: When checking out paths from the index, check out stage #2 (ours) or #3 (theirs) for unmerged paths. So: git checkout –ours <path(s)>
My solution was to change the Git version from ‘Use Embedded Git’ to ‘Use System Git’. Because I installed GitHub on my computer earlier, it seems SourceTree chose that Git by default rather than download the embedded version when it was installed.
I’d say that with published work, you should just always use annotated tags. That extra information is never going to harm you. Lightweight tags strike me as being more for when you’re being lazy. Maybe a temporary tag (just make sure you don’t accidentally push it; really you could just use a branch), or maybe … Read more
You can manually edit the hunk by typing e and then edit the hunk so that it only contains whatever you need (note the space before all imports except the one you want to add): # Manual hunk edit mode — see bottom for a quick guide. @@ -1,5 +1,5 @@ import org.hamcrest.CoreMatchers; import org.junit.Ignore; … Read more
Try: git log –oneline — ‘*.txt’ The — is used to indicate only positional arguments will follow. And ‘*.txt’ searches all folders from the current directory on down. Alternatively, you could limit the results by starting the search in a subdirectory, e.g. — ‘sub/*.txt’.
No, they will not be gc’s because they’re not wholly unreferenced even if you delete your branch. Github creates a branch (actually, two) for every pull request. They’re in a non-default namespace so you dont usually get them when you pull (or fetch) from the repo. To see how this looks in practice, do a … Read more