当我执行git push
时,如果需要,git将自动执行强制更新,就像我指定了--force
选项一样。我早就配置好了。我不再需要这种行为,也找不到影响这种行为的配置变量是什么。我在.gitconfig
或.git/config
文件中找不到任何相关内容。
编辑:添加了我当前的配置文件:
我的.gitconfig:
[user]
name = xxxx xxxx
email = xxxx
[core]
excludesfile = /Users/xxxx/.gitignore_global
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
本地回购配置:
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
[remote "origin"]
url = ssh://xxxx@xxxx.com/var/git/tw
fetch = +refs/heads/*:refs/remotes/origin/*
push = +refs/heads/*:refs/heads/*
[remote "AudioCopy"]
url = /Users/xxxx/Src/AudioCopy/myacp
fetch = +refs/heads/*:refs/remotes/AudioCopy/*
[submodule "Sources/iPhoneInterface/SoundCloud/CocoaSoundCloudAPI"]
url = git://github.com/soundcloud/CocoaSoundCloudAPI.git
[submodule "Sources/iPhoneInterface/SoundCloud/CocoaSoundCloudUI"]
url = git://github.com/soundcloud/CocoaSoundCloudUI.git
[submodule "Sources/iPhoneInterface/SoundCloud/JSONKit"]
url = git://github.com/nxtbgthng/JSONKit.git
[submodule "Sources/iPhoneInterface/SoundCloud/OAuth2Client"]
url = git://github.com/nxtbgthng/OAuth2Client.git
[submodule "Sources/iPhoneInterface/SoundCloud/OHAttributedLabel"]
url = git://github.com/nxtbgthng/OHAttributedLabel.git
[branch "linux"]
remote = origin
merge = refs/heads/linux
远程回购配置:
[core]
repositoryformatversion = 0
filemode = true
bare = true
样本运行:
~/Src/tw % git push
Counting objects: 7, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 394 bytes, done.
Total 3 (delta 2), reused 0 (delta 0)
To ssh://xxxx@xxxx.com/var/git/tw
26636fd..4247b2e guile20 -> guile20
+ e80b72f...3578ee1 linux -> linux (forced update)
~/Src/tw %
最佳答案
从您的[remote "origin"]
配置项中,您似乎设置了镜像推送。如果这不是你想要的,我会把这条线完全去掉。如果您对镜像样式的推送感到满意,但不想强制(这对我来说没有多大意义),则需要从本地存储库配置的+
部分的推送行中删除[remote "origin"]
前缀。
或者:
git config --unset remote.origin.push
或:
git config remote.origin.push 'refs/heads/*:refs/heads/*'
取决于你的选择。