在github而不是整个分支上推送文件

Question

Here are the steps I am following to push/commit my changes of file.txt from my local to my staged branch :

1. git add file.txt
2. git commit -m "my file is changed"
3. git push <my-remote> <my-branch>

The problem is, the whole branch is pushed and merged, not only the changes in the file. How do I avoid this ? And how do I delete from the history of my commits this specific one ? so I can send a clean pull request to the master.

Answer 1

That's not how git works. Push is used to send all your changes that the remote branch does not have. If you want to throw away all your other changes besides the commit named "my file is changed", you can do

git rebase -i $(git rev-parse origin/branch_name)

Set all the other commits to "d" for drop except for "my file is changed". This will delete all the other commits and you can now push to push only that single commit.

However, if your goal is to keep those other commits, I'd suggest checking out a new branch from the head of your remote branch and cherry-picking your single commit onto there, creating your pull request from this new branch instead.

git checkout -b new_branch_name origin/branch_name
git cherry-pick commit_sha
git push -u origin new_branch_name

If you need to then remove the single commit from your original branch, just perform the first command I listed and drop that single commit instead of the others.

Answer 2

当dev是您的远程分支时，请尝试

git push origin HEAD:refs/for/dev