$ git rm --cached filename
$ git merge <branch-name> —squash —no-commit
##Getting info
Get log since 2 weeks
$ git log --since=2.weeks --author=jlara
Get log since specific date
$ git log --since="2014-03-18" --author=jlara --all-match
Get log since 3 weeks for both authors
$ git log --since=3.weeks --author=jlara --author=rgutierrez --all-match
Clean untracked files
$ git clean -f -d