Skip to content

Instantly share code, notes, and snippets.

@jamesray1
Created August 23, 2018 00:49
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jamesray1/150bd047c2292f3671ee1ae6652ab9a8 to your computer and use it in GitHub Desktop.
Save jamesray1/150bd047c2292f3671ee1ae6652ab9a8 to your computer and use it in GitHub Desktop.
git reset --soft <commit> && git commit
➜ libp2p-specs git:(rfc/gossipsub-minor-edits-v-2) git reset --soft HEAD-10
fatal: ambiguous argument 'HEAD-10': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
➜ libp2p-specs git:(rfc/gossipsub-minor-edits-v-2) git log
➜ libp2p-specs git:(rfc/gossipsub-minor-edits-v-2) git reset --soft 7a78aa642db7d453a1dd6eb6b2a0f531da7db80f && git commit
[rfc/gossipsub-minor-edits-v-2 18c4cd3] "Minor edits with grammar, clarity and links"
1 file changed, 70 insertions(+), 64 deletions(-)
➜ libp2p-specs git:(rfc/gossipsub-minor-edits-v-2) git push
Username for 'https://github.com': jamesray1
Password for 'https://jamesray1@github.com':
To https://github.com/jamesray1/specs.git
! [rejected] rfc/gossipsub-minor-edits-v-2 -> rfc/gossipsub-minor-edits-v-2 (non-fast-forward)
error: failed to push some refs to 'https://github.com/jamesray1/specs.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
➜ libp2p-specs git:(rfc/gossipsub-minor-edits-v-2) git push -f
Username for 'https://github.com': jamesray1
Password for 'https://jamesray1@github.com':
Enumerating objects: 9, done.
Counting objects: 100% (9/9), done.
Delta compression using up to 4 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.37 KiB | 700.00 KiB/s, done.
Total 5 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To https://github.com/jamesray1/specs.git
+ 50f0715...18c4cd3 rfc/gossipsub-minor-edits-v-2 -> rfc/gossipsub-minor-edits-v-2 (forced update)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment