Merge branch 'jc/reflog-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2013 20:50:12 +0000 (13:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2013 20:50:12 +0000 (13:50 -0700)
commit6c2bec96a8215bad7745d559c631e45332c5a9ee
tree23cf1f401779b2052407e42644853beb8f676cc3
parentdec034a34e3887beaea9a7a390fd950346806c1e
parentc3e2d18996e4ef92f37bf56b2fefe2124d26659e
Merge branch 'jc/reflog-doc'

Document rules to use GIT_REFLOG_ACTION variable in the scripted
Porcelain.  git-rebase--interactive locally violates them, but it
is a leaf user that does not call out to or dot-source other
scripts, so it does not urgently need to be fixed.

* jc/reflog-doc:
  setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
Documentation/git-sh-setup.txt
Documentation/git.txt
git-sh-setup.sh