Changing git commit AUTHOR and COMMITTER

It’s as simple as: git -c user.name="Author Name" -c user.email=author@email.com commit --amend --reset-author All done.
git

Change Git Commit Date and Git Commit Author Date

To see the author and commit date, do the following in terminal: git log --pretty=fuller…
git

Resolving Cherry-Pick Git Conflicts with Incoming Changes

It’s as easy as pie:¬†git cherry-pick --strategy=recursive -X theirs {hash}