How do you branch and merge with TortoiseSVN? [closed]
My easy click-by-click instructions (specific to TortoiseSVN) are in Stack Overflow question What is the simplest way to do branching and merging using TortoiseSVN?.
branch
How do I manage conflicts with git submodules?
Well, its not technically managing conflicts with submodules (ie: keep this but not that), but I found a way to continue working…and all I had to do was pay attention to my git status output and reset the submodules: git reset HEAD subby git commit That would reset the submodule to the pre-pull commit. Which … Read more
Get all files that have been modified in git branch
An alternative to the answer by @Marco Ponti, and avoiding the checkout: git diff –name-only <notMainDev> $(git merge-base <notMainDev> <mainDev>) If your particular shell doesn’t understand the $() construct, use back-ticks instead.
How do I create a branch?
Create a new branch using the svn copy command as follows: $ svn copy svn+ssh://host.example.com/repos/project/trunk \ svn+ssh://host.example.com/repos/project/branches/NAME_OF_BRANCH \ -m “Creating a branch of project”
How do I run git log to see changes only for a specific branch?
Assuming that your branch was created off of master, then while in the branch (that is, you have the branch checked out): git cherry -v master or git log master.. If you are not in the branch, then you can add the branch name to the “git log” command, like this: git log master..branchname If … Read more
Why gcc 4.1 + gcov reports 100% branch coverage and newer (4.4, 4.6, 4.8) reports 50% for “p = new class;” line?
Solved ! We have some C/C++ files with and without exceptions handling, so lcov/gcov process “exceptions handling” for each code block. Inside a normal block, for example: int main(void) { … … [+ -] printf(“Hello\n”); … } gcov reports that printf line has a “branch coverage” of 50% —> WHY ? Because exceptions handling is … Read more
Git rebase branch with all parent branches (or dependent sub-branches)
According to git’s Object Model if you only change the meta-data of a commit (i.e. commit message) but not the underlying data (“tree(s)”) contained within it then it’s Tree hash will remain unchanged. Aside from editing a commit message, you are also performing a rebase, which will change the Tree hashes of each commit in … Read more
In git, how do I remove a commit from one branch and apply it to a different branch?
Cherry-pick commit to target branch and reset source branch. Assuming, you want to move the latest commit from source branch to target, do: git checkout target git cherry-pick source git checkout source git reset –hard source^ If the commit wasn’t the last, you will have to use git rebase -i instead of the last command … Read more
Block a git branch from being pushed
Here’s how the pre-push hook approach works, with a branch called dontpushthis. Create this file as .git/hooks/pre-push: #!/usr/bin/bash if [[ `grep ‘dontpushthis’` ]]; then echo “You really don’t want to push this branch. Aborting.” exit 1 fi This works because the list of refs being pushed is passed on standard input. So this will also … Read more
How to see commits that were merged in to a merge commit?
git log abc123^..abc123 shows the commits that got merged into merge-commit abc123. Create a git alias log-merge for easy reuse: $ git config –global alias.log-merge \ ‘!f() { git log –stat “$1^..$1”; }; f’ $ git log-merge abc123 For a one-line version: $ git config –global alias.log-merge-short \ ‘!f() { git log –pretty=oneline “$1^..$1”; }; … Read more