mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: Documentation: receive.denyCurrentBranch defaults to 'refuse' bash: complete *_HEAD refs if present
This commit is contained in:
commit
f1ba1c90e1
|
@ -1453,7 +1453,7 @@ receive.denyCurrentBranch::
|
|||
out of sync with the index and working tree. If set to "warn",
|
||||
print a warning of such a push to stderr, but allow the push to
|
||||
proceed. If set to false or "ignore", allow such pushes with no
|
||||
message. Defaults to "warn".
|
||||
message. Defaults to "refuse".
|
||||
|
||||
receive.denyNonFastForwards::
|
||||
If set to true, git-receive-pack will deny a ref update which is
|
||||
|
|
|
@ -250,7 +250,9 @@ __git_refs ()
|
|||
refs="${cur%/*}"
|
||||
;;
|
||||
*)
|
||||
if [ -e "$dir/HEAD" ]; then echo HEAD; fi
|
||||
for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
|
||||
if [ -e "$dir/$i" ]; then echo $i; fi
|
||||
done
|
||||
format="refname:short"
|
||||
refs="refs/tags refs/heads refs/remotes"
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue