If you have a git repository that consist of several submodules you can push all submodules by doing the following: place yourself in the main git repo. write: git submodule foreach git push To make sure that you get through all the submodules even if errors occurs do: git submodule foreach “git push || true”
Tags: foreach, git, submodules
You have made changes to a file that you realize was wrong (eg. overrige a file’s content) and you want to revert it to the latest comitted version: git checkout <filename> If you have a branch with the same name you need to do: git checkout — <filename> source: http://norbauer.com/notebooks/code/notes/git-revert-reset-a-single-file
Possible merge tools: kdiff3 and meld Setup kdiff3 in git git config –global difftool.prompt false git config –global difftool.kdiff3.trustExitCode false git config –global diff.tool kdiff3 git config –global mergetool.kdiff3.trustExitCode false git config –global mergetool.keepBackup false git config –global merge.tool kdiff3 When forming a merge command the following variables can be used (This should however not […]
Tags: git, git diff, git difftool, git merge, git mergetool, kdiff3, meld