git submodule usage

Update: Looks like subtrees are a nicer alternative to submodules. Anyway..

• To update all submodules:

git submodule update --init --recursive

• To fetch the latest code from a submodule:

    cd <submodule-folder>
    git pull
    cd ..
    git commit -am "bumping up submodule version"

Then merge the code. The next time the parent repository is pulled, updating the submodule will get the latest commit in it.

git: rebase vs pull/merge

• Instead of a normal pull, try this:

git pull --rebase origin master

• ‘The --rebase option tells Git to move all of Mary’s commits to the tip of the master branch after synchronising it with the changes from the central repository.’
• From here: https://www.atlassian.com/git/tutorials/comparing-workflows/centralized-workflow
• This removes the superfluous ‘merge commit’ that comes up normally.
• After fixing a merge conflict:

git add <some-file>
git rebase --continue

• To abort:

git rebase --abort

• Finally:

git push origin master

Bitbucket – checkout a Pull Request

From here: https://gist.github.com/hongymagic/6339056

First add this to .git/config under the origin section:

    fetch = +refs/pull-requests/*:refs/remotes/origin/pull-requests/*

Then fetch the pull requests:

git fetch origin

Then checkout the one you want:

git checkout pull-requests/1000/from

git – Show/diff parents of a merge commit

git cat-file -p <commit>

or

git show --pretty=raw <commit>

Both these show similar information: the committer, the parent(s), commit text and so on.

Now that you have the two parents of a merged request (see above tip), you can see all files changed between its two parents with a command like this:

git diff --name-only <sha1> <sha2>

Separate git configurations for work and play

Put something like this in your ~/.gitconfig:

[includeIf "gitdir:~/work/"]
    path = ~/.gitconfig.work

[includeIf "gitdir:~/code/"]
    path = ~/.gitconfig.personal

If your work repos are in ~/work, you can have a separate user/email etc for repos in that folder.

Git – reverting a reverted commit

If you’ve reverted a recent commit with:

git reset HEAD^

You can undo the revert with this:

git reset HEAD@{1}