Using git

From UBIFSWiki

Online

• A tutorial introduction to git
• Kernel Hackers' Guide to git

Suggestions

• Revert last commit

git reset --hard HEAD^

• Revert only the commit action (keep file modifications)

git reset --soft HEAD^

• Show all your modification

git diff origin

• Show your last modification

git diff HEAD^

• Avoid merge commits

git branch my-branch
git checkout my-branch
..edit files...
git-commit
git checkout master
git pull
git checkout my-branch
git-rebase master
..resolve conflicts if there is any..
..git-commit if the conflicts are resolved..

• Check whitespaces before commit

git-diff --check HEAD

• Create a patch

git-format-patch origin -o /some/place/

• Send a patch

git-send-email git-format-patch.txt