Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git log --oneline
- 59e2573 (HEAD -> master) ajout d un second paragraphe
- ece83a9 ajout de paragraphe
- 9b36e8d crea fichier et modif titre
- a95e1b7 création de index puis modif title
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ ^C
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ ^C
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ ^C
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git revert ece83a9
- error: could not revert ece83a9... ajout de paragraphe
- hint: after resolving the conflicts, mark the corrected paths
- hint: with 'git add <paths>' or 'git rm <paths>'
- hint: and commit the result with 'git commit'
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git status
- On branch master
- You are currently reverting commit ece83a9.
- (fix conflicts and run "git revert --continue")
- (use "git revert --abort" to cancel the revert operation)
- Unmerged paths:
- (use "git reset HEAD <file>..." to unstage)
- (use "git add <file>..." to mark resolution)
- both modified: index.html
- no changes added to commit (use "git add" and/or "git commit -a")
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git revert --qbort
- usage: git revert [<options>] <commit-ish>...
- or: git revert <subcommand>
- --quit end revert or cherry-pick sequence
- --continue resume revert or cherry-pick sequence
- --abort cancel revert or cherry-pick sequence
- -n, --no-commit don't automatically commit
- -e, --edit edit the commit message
- -s, --signoff add Signed-off-by:
- -m, --mainline <parent-number>
- select mainline parent
- --rerere-autoupdate update the index with reused conflict resolution if possible
- --strategy <strategy>
- merge strategy
- -X, --strategy-option <option>
- option for merge strategy
- -S, --gpg-sign[=<key-id>]
- GPG sign commit
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git revert --abort
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git status
- On branch master
- nothing to commit, working tree clean
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git log --oneline
- 59e2573 (HEAD -> master) ajout d un second paragraphe
- ece83a9 ajout de paragraphe
- 9b36e8d crea fichier et modif titre
- a95e1b7 création de index puis modif title
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git revert ^C
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git revert 9b36e8d
- [master 23fc786] Revert "crea fichier et modif titre"
- 1 file changed, 1 insertion(+), 1 deletion(-)
- wilder@wilder-ThinkPad-T440p:~/sharezza-oops$ git log --oneline
- 23fc786 (HEAD -> master) Revert "crea fichier et modif titre"
- 59e2573 ajout d un second paragraphe
- ece83a9 ajout de paragraphe
- 9b36e8d crea fichier et modif titre
- a95e1b7 création de index puis modif title
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement