Retain author after a cherry-pick conflict

after a conflict i get the message to use git commit -c xxxxxx. When i do that i get another window having the desciption of my commit +a author but have no idea how to move on from there.

  • Revert to previous commit and ignore any uncommited changes in git
  • Include last commit index in project
  • Build on commit with subversion
  • How do you merge two Git repositories when one is a subdirectory of the other without losing commit history?
  • GitHub - How to revert changes to previous state
  • How to avoid commiting for DW dynamic files?
  • Git map directory to branch
  • Rebasing when existing commit hashes have changed
  • Project using git with MonoDevelop / Windows 7
  • Recover unreferenced commits from remote git repository
  • Do git update-index --assume-unchanged rules propagate to clients on pull?
  • merge one local branch into another local branch
  • One Solution collect form web for “Retain author after a cherry-pick conflict”

    Perhaps you want the -C option to git commit instead of -c. If you’re trying to go the other direction, look at --reset-author. Either way, have a look at the Options section of git help commit to see exactly what each of these does.

    Git Baby is a git and github fan, let's start git clone.