Advertisement
Guest User

Untitled

a guest
Jan 19th, 2020
257
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.95 KB | None | 0 0
  1. Ant@ant-519666801b8 ~/db-staging
  2. $ git reset --hard HEAD~1
  3. HEAD is now at 6e14805 Add a missing include of stdio.h for snprintf().
  4.  
  5. Ant@ant-519666801b8 ~/db-staging
  6. $ git commit --amend -m "Add a missing include of stdio.h for snprintf()"
  7. [as/test-1 2c5322d] Add a missing include of stdio.h for snprintf()
  8. Author: ant-222 <43175957+ant-222@users.noreply.github.com>
  9. Date: Sat Jan 18 22:33:44 2020 +0300
  10. 1 file changed, 2 insertions(+)
  11.  
  12. Ant@ant-519666801b8 ~/db-staging
  13. $ git cherry-pick 6e1480
  14. On branch as/test-1
  15. Your branch and 'origin/as/test-1' have diverged,
  16. and have 1 and 2 different commits each, respectively.
  17. (use "git pull" to merge the remote branch into yours)
  18. You are currently cherry-picking commit 6e14805.
  19.  
  20. nothing to commit, working tree clean
  21. The previous cherry-pick is now empty, possibly due to conflict resolution.
  22. If you wish to commit it anyway, use:
  23.  
  24. git commit --allow-empty
  25.  
  26. Otherwise, please use 'git reset'
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement