summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-26 10:34:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-26 10:34:53 -0700
commit695db86ad73cc3c1dca43fb60cdf469f8d26e358 (patch)
treee0a3c3a1598564fc473864ef9a8d074a693a05ca /mergetools
parent7b90ed59fab1b288b4a9ac888d1c5a194a66c812 (diff)
parent7dfe8ad6006c105989e4e8cfb196aa4ecda3c21d (diff)
downloadgit-695db86ad73cc3c1dca43fb60cdf469f8d26e358.tar.gz
Merge branch 'jc/commit-hook-authorship' into maint
"git commit --author=$name" did not tell the name that was being recorded in the resulting commit to hooks, even though it does do so when the end user overrode the authorship via the "GIT_AUTHOR_NAME" environment variable. * jc/commit-hook-authorship: commit: pass author/committer info to hooks t7503: does pre-commit-hook learn authorship? ident.c: add split_ident_line() to parse formatted ident line
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions