Warm tip: This article is reproduced from serverfault.com, please click
git

git reset can't work when commited with force push

发布于 2020-11-28 05:31:20

I have forgotten to update my local repo with git pull and i commited to a file myfile.py and then pushed them with git push -f upstream master

Later i realised it and tried to reset to the commit id but after resetting found that it isn't showing the files which i have committed to the remote upstream (it's just the files in my local repo, with the commited myfile.py)

Anyway to reset to the point before it was commited with git push -f upstream master

Questioner
MissJuliaRobot
Viewed
0
分享
Key 2020-11-28 16:17:16

Explanation

So first, the history of your local repository is different from your remote repository. When you forced push, your remote repository's history now matches with your local repository. What happens is, the changes in your remote repository before force pushing is already lost. So there aren't many ways to fix this.

Solution

However, you can ask a friend who has the latest history before you force pushed to force push his local repository. Then you can cherry-pick your commit in later.

Note

Force pushing is usually only used in branches that you work alone. Using it in branches that others are working with is extremely dangerous and you really need to know what you are doing if you really need to do so.

I think you accidentally post this twice. It's similar to this thread: git reset hard doesn't recover commits with force push

热门github

1
Implementation of paper - YOLOv9: Learning What You Want to Learn Using Programmable Gradient Information
2
A Windows and Office activator using HWID / Ohook / KMS38 / Online KMS activation methods, with a focus on open-source code and fewer antivirus detections.
3
Get up and running with Llama 2, Mistral, Gemma, and other large language models.
4
该项目可以让你通过订阅的方式使用Cloudflare WARP+，自动获取流量。This project enables you to use Cloudflare WARP+ through subscription, automatically acquiring traffic.
5
Multi functional app to find duplicates, empty folders, similar images etc.
6
Xray panel supporting multi-protocol multi-user expire day & traffic & ip limit (Vmess & Vless & Trojan & ShadowSocks & Wireguard)
7
The Free Software Media System
8
lightweight, standalone C++ inference engine for Google's Gemma models.
9
📚 Freely available programming books
10
A collective list of free APIs
11
1️⃣🐝🏎️ The One Billion Row Challenge -- A fun exploration of how quickly 1B rows from a text file can be aggregated with Java
12
🎓 Path to a free self-taught education in Computer Science!
13
Curso para aprender el lenguaje de programación Python desde cero y para principiantes. 75 clases, 37 horas en vídeo, código, proyectos y grupo de chat. Fundamentos, frontend, backend, testing, IA...
14
This repository contains System Design resources which are useful while preparing for interviews and learning Distributed Systems
15
Mamba is a new state space model architecture showing promising performance on information-dense data such as language modeling, where previous subquadratic models fall short of Transformers. It is based on the line of progress on structured state space models, with an efficient hardware-aware design and implementation in the spirit of FlashAttention.