Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking
commite9800b28c24465377dc2b8e26b322d362912647c
authorJunio C Hamano <junkio@cox.net>
Wed, 27 Sep 2006 07:53:29 +0000 (27 00:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 27 Sep 2006 07:53:29 +0000 (27 00:53 -0700)
treea68c6d69a03497bd297c3a67238cd6e6b6fc505a
parent244a0ae114824c8ca29bdc2148b98caaae39cac2
parenteaf12a8c7d844be947c29954b658c17996abcd25
Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking

* jc/lt-ref2-with-lt-refs:
  Fix show-ref usage for --dereference.
  Document git-show-ref [-s|--hash] option.
  Add man page for git-show-ref
  gitignore: git-show-ref is a generated file.
  Use Linus' show ref in "git-branch.sh".
  Add [-s|--hash] option to Linus' show-ref.
  Teach "git checkout" to use git-show-ref
  Add "git show-ref" builtin command
.gitignore
Makefile
builtin.h
git.c