Rebasing with upstream files.
Added git config info.