45 items | 1 visits
D C's List: Git
-
-
This is where the git cherry command is useful. Git cherry finds commits not merged from a branch to another. From the man page:
"Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the <upstream> branch are prefixed with a minus (-) sign, and those that only exist in the <head> branch are prefixed with a plus (+) symbol"
-
-
-
git difftool -d master otherbranch
-
-
-
-
-
git branch temp git checkout temp
-
If your new
tempbranch looks good, you may want to update (e.g.)masterto point to it:
-
-
Oct 28, 14
.gitconfig:
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE -
Oct 28, 14
-
This workflow works best for me:
git checkout -b develop -
git checkout master git pull
-
-
-
-
git mergetool -t meld
-
-
-
-
-
It looks that complete solution is:
git clean -df git checkout -- .git clean removes all untracked files and git checkout clears all unstaged changes
-
-
-
-
List Comments
(0)
List Info