--- a/components/git/git.p5m Tue Mar 29 11:52:32 2016 -0700
+++ b/components/git/git.p5m Thu Mar 24 11:11:33 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/lib/git-core/.* -> default mode 0555>
@@ -44,44 +44,44 @@
set name=org.opensolaris.arc-caseid value=LSARC/2008/360
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-hardlink path=usr/bin/git target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git target=../lib/git-core/git
hardlink path=usr/bin/git-cvsserver target=../lib/git-core/git-cvsserver
-hardlink path=usr/bin/git-receive-pack target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git-receive-pack target=../lib/git-core/git
hardlink path=usr/bin/git-shell target=../lib/git-core/git-shell
-hardlink path=usr/bin/git-upload-archive target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git-upload-archive target=../lib/git-core/git
hardlink path=usr/bin/git-upload-pack target=../lib/git-core/git-upload-pack
file path=usr/bin/gitk
-hardlink path=usr/lib/git-core/git target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-add target=git-cherry-pick
+file path=usr/lib/git-core/git
+hardlink path=usr/lib/git-core/git-add target=git
file path=usr/lib/git-core/git-add--interactive
-hardlink path=usr/lib/git-core/git-am target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-annotate target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-apply target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-am target=git
+hardlink path=usr/lib/git-core/git-annotate target=git
+hardlink path=usr/lib/git-core/git-apply target=git
file path=usr/lib/git-core/git-archimport
-hardlink path=usr/lib/git-core/git-archive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-archive target=git
file path=usr/lib/git-core/git-bisect
-hardlink path=usr/lib/git-core/git-bisect--helper target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-blame target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-branch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-bundle target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-cat-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-attr target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-ignore target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-mailmap target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-ref-format target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-checkout target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-checkout-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-cherry target=git-cherry-pick
-file path=usr/lib/git-core/git-cherry-pick
+hardlink path=usr/lib/git-core/git-bisect--helper target=git
+hardlink path=usr/lib/git-core/git-blame target=git
+hardlink path=usr/lib/git-core/git-branch target=git
+hardlink path=usr/lib/git-core/git-bundle target=git
+hardlink path=usr/lib/git-core/git-cat-file target=git
+hardlink path=usr/lib/git-core/git-check-attr target=git
+hardlink path=usr/lib/git-core/git-check-ignore target=git
+hardlink path=usr/lib/git-core/git-check-mailmap target=git
+hardlink path=usr/lib/git-core/git-check-ref-format target=git
+hardlink path=usr/lib/git-core/git-checkout target=git
+hardlink path=usr/lib/git-core/git-checkout-index target=git
+hardlink path=usr/lib/git-core/git-cherry target=git
+hardlink path=usr/lib/git-core/git-cherry-pick target=git
hardlink path=usr/lib/git-core/git-citool target=git-gui
-hardlink path=usr/lib/git-core/git-clean target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-clone target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-column target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-commit target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-commit-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-config target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-count-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-credential target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-clean target=git
+hardlink path=usr/lib/git-core/git-clone target=git
+hardlink path=usr/lib/git-core/git-column target=git
+hardlink path=usr/lib/git-core/git-commit target=git
+hardlink path=usr/lib/git-core/git-commit-tree target=git
+hardlink path=usr/lib/git-core/git-config target=git
+hardlink path=usr/lib/git-core/git-count-objects target=git
+hardlink path=usr/lib/git-core/git-credential target=git
file path=usr/lib/git-core/git-credential-cache
file path=usr/lib/git-core/git-credential-cache--daemon
file path=usr/lib/git-core/git-credential-store
@@ -89,133 +89,134 @@
file path=usr/lib/git-core/git-cvsimport
file path=usr/lib/git-core/git-cvsserver
file path=usr/lib/git-core/git-daemon
-hardlink path=usr/lib/git-core/git-describe target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-files target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-describe target=git
+hardlink path=usr/lib/git-core/git-diff target=git
+hardlink path=usr/lib/git-core/git-diff-files target=git
+hardlink path=usr/lib/git-core/git-diff-index target=git
+hardlink path=usr/lib/git-core/git-diff-tree target=git
file path=usr/lib/git-core/git-difftool
file path=usr/lib/git-core/git-difftool--helper
-hardlink path=usr/lib/git-core/git-fast-export target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fast-export target=git
file path=usr/lib/git-core/git-fast-import
-hardlink path=usr/lib/git-core/git-fetch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fetch-pack target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fetch target=git
+hardlink path=usr/lib/git-core/git-fetch-pack target=git
file path=usr/lib/git-core/git-filter-branch
-hardlink path=usr/lib/git-core/git-fmt-merge-msg target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-for-each-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-format-patch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fsck target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fsck-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-gc target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-get-tar-commit-id target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-grep target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fmt-merge-msg target=git
+hardlink path=usr/lib/git-core/git-for-each-ref target=git
+hardlink path=usr/lib/git-core/git-format-patch target=git
+hardlink path=usr/lib/git-core/git-fsck target=git
+hardlink path=usr/lib/git-core/git-fsck-objects target=git
+hardlink path=usr/lib/git-core/git-gc target=git
+hardlink path=usr/lib/git-core/git-get-tar-commit-id target=git
+hardlink path=usr/lib/git-core/git-grep target=git
file path=usr/lib/git-core/git-gui
file path=usr/lib/git-core/git-gui--askpass
-hardlink path=usr/lib/git-core/git-hash-object target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-help target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-hash-object target=git
+hardlink path=usr/lib/git-core/git-help target=git
file path=usr/lib/git-core/git-http-backend
file path=usr/lib/git-core/git-http-fetch
file path=usr/lib/git-core/git-http-push
file path=usr/lib/git-core/git-imap-send
-hardlink path=usr/lib/git-core/git-index-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-init target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-init-db target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-index-pack target=git
+hardlink path=usr/lib/git-core/git-init target=git
+hardlink path=usr/lib/git-core/git-init-db target=git
file path=usr/lib/git-core/git-instaweb
-hardlink path=usr/lib/git-core/git-interpret-trailers target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-log target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-ls-files target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-ls-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-ls-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mailinfo target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mailsplit target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-base target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-index target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-interpret-trailers target=git
+hardlink path=usr/lib/git-core/git-log target=git
+hardlink path=usr/lib/git-core/git-ls-files target=git
+hardlink path=usr/lib/git-core/git-ls-remote target=git
+hardlink path=usr/lib/git-core/git-ls-tree target=git
+hardlink path=usr/lib/git-core/git-mailinfo target=git
+hardlink path=usr/lib/git-core/git-mailsplit target=git
+hardlink path=usr/lib/git-core/git-merge target=git
+hardlink path=usr/lib/git-core/git-merge-base target=git
+hardlink path=usr/lib/git-core/git-merge-file target=git
+hardlink path=usr/lib/git-core/git-merge-index target=git
file path=usr/lib/git-core/git-merge-octopus
file path=usr/lib/git-core/git-merge-one-file
-hardlink path=usr/lib/git-core/git-merge-ours target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-recursive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-merge-ours target=git
+hardlink path=usr/lib/git-core/git-merge-recursive target=git
file path=usr/lib/git-core/git-merge-resolve
-hardlink path=usr/lib/git-core/git-merge-subtree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-merge-subtree target=git
+hardlink path=usr/lib/git-core/git-merge-tree target=git
file path=usr/lib/git-core/git-mergetool
file path=usr/lib/git-core/git-mergetool--lib
-hardlink path=usr/lib/git-core/git-mktag target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mktree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mv target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-name-rev target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-notes target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-mktag target=git
+hardlink path=usr/lib/git-core/git-mktree target=git
+hardlink path=usr/lib/git-core/git-mv target=git
+hardlink path=usr/lib/git-core/git-name-rev target=git
+hardlink path=usr/lib/git-core/git-notes target=git
file path=usr/lib/git-core/git-p4
-hardlink path=usr/lib/git-core/git-pack-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-redundant target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-refs target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-pack-objects target=git
+hardlink path=usr/lib/git-core/git-pack-redundant target=git
+hardlink path=usr/lib/git-core/git-pack-refs target=git
file path=usr/lib/git-core/git-parse-remote
-hardlink path=usr/lib/git-core/git-patch-id target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-prune target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-prune-packed target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pull target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-push target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-patch-id target=git
+hardlink path=usr/lib/git-core/git-prune target=git
+hardlink path=usr/lib/git-core/git-prune-packed target=git
+hardlink path=usr/lib/git-core/git-pull target=git
+hardlink path=usr/lib/git-core/git-push target=git
file path=usr/lib/git-core/git-quiltimport
-hardlink path=usr/lib/git-core/git-read-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-read-tree target=git
file path=usr/lib/git-core/git-rebase
file path=usr/lib/git-core/git-rebase--am
file path=usr/lib/git-core/git-rebase--interactive
file path=usr/lib/git-core/git-rebase--merge
-hardlink path=usr/lib/git-core/git-receive-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-reflog target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-receive-pack target=git
+hardlink path=usr/lib/git-core/git-reflog target=git
file path=usr/lib/git-core/git-relink
-hardlink path=usr/lib/git-core/git-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-remote-ext target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-remote-fd target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-remote target=git
+hardlink path=usr/lib/git-core/git-remote-ext target=git
+hardlink path=usr/lib/git-core/git-remote-fd target=git
hardlink path=usr/lib/git-core/git-remote-ftp target=git-remote-ftps
file path=usr/lib/git-core/git-remote-ftps
hardlink path=usr/lib/git-core/git-remote-http target=git-remote-ftps
hardlink path=usr/lib/git-core/git-remote-https target=git-remote-ftps
file path=usr/lib/git-core/git-remote-testsvn
-hardlink path=usr/lib/git-core/git-repack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-replace target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-repack target=git
+hardlink path=usr/lib/git-core/git-replace target=git
file path=usr/lib/git-core/git-request-pull
-hardlink path=usr/lib/git-core/git-rerere target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-reset target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rev-list target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rev-parse target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-revert target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rm target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-rerere target=git
+hardlink path=usr/lib/git-core/git-reset target=git
+hardlink path=usr/lib/git-core/git-rev-list target=git
+hardlink path=usr/lib/git-core/git-rev-parse target=git
+hardlink path=usr/lib/git-core/git-revert target=git
+hardlink path=usr/lib/git-core/git-rm target=git
file path=usr/lib/git-core/git-send-email
-hardlink path=usr/lib/git-core/git-send-pack target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-send-pack target=git
file path=usr/lib/git-core/git-sh-i18n
file path=usr/lib/git-core/git-sh-i18n--envsubst
file path=usr/lib/git-core/git-sh-setup
file path=usr/lib/git-core/git-shell
-hardlink path=usr/lib/git-core/git-shortlog target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-show target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-show-branch target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-shortlog target=git
+hardlink path=usr/lib/git-core/git-show target=git
+hardlink path=usr/lib/git-core/git-show-branch target=git
file path=usr/lib/git-core/git-show-index
-hardlink path=usr/lib/git-core/git-show-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-stage target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-show-ref target=git
+hardlink path=usr/lib/git-core/git-stage target=git
file path=usr/lib/git-core/git-stash
-hardlink path=usr/lib/git-core/git-status target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-stripspace target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-status target=git
+hardlink path=usr/lib/git-core/git-stripspace target=git
file path=usr/lib/git-core/git-submodule
+hardlink path=usr/lib/git-core/git-submodule--helper target=git
file path=usr/lib/git-core/git-svn
-hardlink path=usr/lib/git-core/git-symbolic-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-tag target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-unpack-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-unpack-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-server-info target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-upload-archive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-symbolic-ref target=git
+hardlink path=usr/lib/git-core/git-tag target=git
+hardlink path=usr/lib/git-core/git-unpack-file target=git
+hardlink path=usr/lib/git-core/git-unpack-objects target=git
+hardlink path=usr/lib/git-core/git-update-index target=git
+hardlink path=usr/lib/git-core/git-update-ref target=git
+hardlink path=usr/lib/git-core/git-update-server-info target=git
+hardlink path=usr/lib/git-core/git-upload-archive target=git
file path=usr/lib/git-core/git-upload-pack
-hardlink path=usr/lib/git-core/git-var target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-verify-commit target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-verify-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-verify-tag target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-var target=git
+hardlink path=usr/lib/git-core/git-verify-commit target=git
+hardlink path=usr/lib/git-core/git-verify-pack target=git
+hardlink path=usr/lib/git-core/git-verify-tag target=git
file path=usr/lib/git-core/git-web--browse
-hardlink path=usr/lib/git-core/git-whatchanged target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-worktree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-write-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-whatchanged target=git
+hardlink path=usr/lib/git-core/git-worktree target=git
+hardlink path=usr/lib/git-core/git-write-tree target=git
file path=usr/lib/git-core/mergetools/araxis
file path=usr/lib/git-core/mergetools/bc
file path=usr/lib/git-core/mergetools/bc3
@@ -355,6 +356,7 @@
file path=usr/share/locale/fr/LC_MESSAGES/git.mo
file path=usr/share/locale/is/LC_MESSAGES/git.mo
file path=usr/share/locale/it/LC_MESSAGES/git.mo
+file path=usr/share/locale/ko/LC_MESSAGES/git.mo
file path=usr/share/locale/pt_PT/LC_MESSAGES/git.mo
file path=usr/share/locale/ru/LC_MESSAGES/git.mo
file path=usr/share/locale/sv/LC_MESSAGES/git.mo