当我执行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
local repo config:
[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
remote repo config:
[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 %
答案 0 :(得分:5)
从您的[remote "origin"]
配置条目看起来您已经设置了镜像推送。如果这不是你想要的,我会完全摆脱这条线。如果你对镜像样式推送感到满意,但又不想强迫(这对我来说没什么意义),你想要从{{1的推送线中删除+
前缀本地存储库配置的部分。
可替换地:
[remote "origin"]
或:
git config --unset remote.origin.push
取决于你做出的选择。