Added mention of git reset to instructions for remerging/rebasing.
drwxr-xr-x - git
drwxr-xr-x - jenkins