First, clear the mess:

git reset --hard HEAD

Then, cherry-pick the commit you are currently rebasing:

git cherry-pick -n `git rev-parse REBASE_HEAD`

That's it. As usual, you will be able to continue the rebase after fixing conflicts

-- Pierre

git add -p

when you have this message when doing a git stash apply :

error: could not restore untracked files from stash

do this (warning will override any unsaved local changes) :

git checkout stash -- .

Find the most useful forks of git repositories

For all unstaged files use:

git checkout -- .

For a specific file use:

git checkout path/to/file/to/revert

Make sure to include the period at the end.

Peut-être ça plutôt https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/merging-an-upstream-repository-into-your-fork

Il faut faire ça avant https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork

For github, maybe all the gits, I don't know, there is an rss feed for the releases

https://github.com/user/repo/releases.atom

git reset --soft HEAD~1

Pour sauvegarder les modifs locales:

git stash

Ensuite, on peut faire un git pull par exemple.
Puis, on restaure les modifs locales:

git stash pop