undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Documentation: receive.denyCurrentBranch defaults to 'refuse'
  bash: complete *_HEAD refs if present
This commit is contained in:
Junio C Hamano 2010-03-17 14:24:08 -07:00
commit f1ba1c90e1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -1453,7 +1453,7 @@ receive.denyCurrentBranch::
out of sync with the index and working tree. If set to "warn", 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 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 proceed. If set to false or "ignore", allow such pushes with no
message. Defaults to "warn". message. Defaults to "refuse".
receive.denyNonFastForwards:: receive.denyNonFastForwards::
If set to true, git-receive-pack will deny a ref update which is If set to true, git-receive-pack will deny a ref update which is

4
contrib/completion/git-completion.bash
View File

@ -250,7 +250,9 @@ __git_refs ()
refs="${cur%/*}" 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" format="refname:short"
refs="refs/tags refs/heads refs/remotes" refs="refs/tags refs/heads refs/remotes"
;; ;;