git: merge and tag tips

Signed-off-by: Tiago Maluta <tiago.maluta@gmail.com.br>