Shaglock

Git Alias and Git Rebase

• Make sure you have configured git tools: see configuring tools.
• Make sure you have updated git aliases: see how to register aliases.

WHEN TO DO REBASE

After each commit in our branch, in order to be up-to-date with the integration branch.

Shaglock

How to recover a dropped stash in Git?

1. Find the stash commits:

git log --graph --oneline --decorate ( git fsck --no-reflog | awk '/dangling commit/ {print $3}' )

This will show you all the commits at the tips of your commit graph which are no longer referenced from any branch or tag – every lost commit, including every stash commit you’ve ever created, will be somewhere in that graph.