StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POgit push --force by default
text
Body
copied!<p>When I do a <code>git push</code>, git will do forced updates automatically if necessary, as if I had specified the <code>--force</code> option. I have configured this a long time ago. I don't want this behavior anymore, and can't find what is the configuration variable that affects this behavior. I can't find anything relevant in the <code>.gitconfig</code> or <code>.git/config</code> files.</p> <p>EDIT: added my current config files:</p> <p>my .gitconfig:</p> <pre><code>[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 </code></pre> <p>local repo config:</p> <pre><code>[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 </code></pre> <p>remote repo config:</p> <pre><code>[core] repositoryformatversion = 0 filemode = true bare = true </code></pre> <p>sample run:</p> <pre><code>~/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 % </code></pre>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload