Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / packages / git

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index 205e68c6894f01b370322c75643cc046e1b8aa73..a2691df55536d5a6bcdcd97d8f65fbd66acf5ca8 100644 (file)
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -1,161 +1,226 @@
 usr/bin/git
-usr/bin/git-add
-usr/bin/git-add--interactive
-usr/bin/git-am
-usr/bin/git-annotate
-usr/bin/git-apply
-usr/bin/git-archimport
-usr/bin/git-archive
-usr/bin/git-bisect
-usr/bin/git-blame
-usr/bin/git-branch
-usr/bin/git-bundle
-usr/bin/git-cat-file
-usr/bin/git-check-attr
-usr/bin/git-check-ref-format
-usr/bin/git-checkout
-usr/bin/git-checkout-index
-usr/bin/git-cherry
-usr/bin/git-cherry-pick
-usr/bin/git-citool
-usr/bin/git-clean
-usr/bin/git-clone
-usr/bin/git-commit
-usr/bin/git-commit-tree
-usr/bin/git-config
-usr/bin/git-count-objects
-usr/bin/git-cvsexportcommit
-usr/bin/git-cvsimport
 usr/bin/git-cvsserver
-usr/bin/git-daemon
-usr/bin/git-describe
-usr/bin/git-diff
-usr/bin/git-diff-files
-usr/bin/git-diff-index
-usr/bin/git-diff-tree
-usr/bin/git-fast-export
-usr/bin/git-fast-import
-usr/bin/git-fetch
-usr/bin/git-fetch--tool
-usr/bin/git-fetch-pack
-usr/bin/git-filter-branch
-usr/bin/git-fmt-merge-msg
-usr/bin/git-for-each-ref
-usr/bin/git-format-patch
-usr/bin/git-fsck
-usr/bin/git-fsck-objects
-usr/bin/git-gc
-usr/bin/git-get-tar-commit-id
-usr/bin/git-grep
-usr/bin/git-gui
-usr/bin/git-hash-object
-usr/bin/git-help--browse
-usr/bin/git-http-fetch
-usr/bin/git-http-push
-usr/bin/git-imap-send
-usr/bin/git-index-pack
-usr/bin/git-init
-usr/bin/git-init-db
-usr/bin/git-instaweb
-usr/bin/git-log
-usr/bin/git-lost-found
-usr/bin/git-ls-files
-usr/bin/git-ls-remote
-usr/bin/git-ls-tree
-usr/bin/git-mailinfo
-usr/bin/git-mailsplit
-usr/bin/git-merge
-usr/bin/git-merge-base
-usr/bin/git-merge-file
-usr/bin/git-merge-index
-usr/bin/git-merge-octopus
-usr/bin/git-merge-one-file
-usr/bin/git-merge-ours
-usr/bin/git-merge-recursive
-usr/bin/git-merge-resolve
-usr/bin/git-merge-stupid
-usr/bin/git-merge-subtree
-usr/bin/git-merge-tree
-usr/bin/git-mergetool
-usr/bin/git-mktag
-usr/bin/git-mktree
-usr/bin/git-mv
-usr/bin/git-name-rev
-usr/bin/git-pack-objects
-usr/bin/git-pack-redundant
-usr/bin/git-pack-refs
-usr/bin/git-parse-remote
-usr/bin/git-patch-id
-usr/bin/git-peek-remote
-usr/bin/git-prune
-usr/bin/git-prune-packed
-usr/bin/git-pull
-usr/bin/git-push
-usr/bin/git-quiltimport
-usr/bin/git-read-tree
-usr/bin/git-rebase
-usr/bin/git-rebase--interactive
 usr/bin/git-receive-pack
-usr/bin/git-reflog
-usr/bin/git-relink
-usr/bin/git-remote
-usr/bin/git-repack
-usr/bin/git-repo-config
-usr/bin/git-request-pull
-usr/bin/git-rerere
-usr/bin/git-reset
-usr/bin/git-rev-list
-usr/bin/git-rev-parse
-usr/bin/git-revert
-usr/bin/git-rm
-usr/bin/git-send-email
-usr/bin/git-send-pack
-usr/bin/git-sh-setup
 usr/bin/git-shell
-usr/bin/git-shortlog
-usr/bin/git-show
-usr/bin/git-show-branch
-usr/bin/git-show-index
-usr/bin/git-show-ref
-usr/bin/git-stash
-usr/bin/git-status
-usr/bin/git-stripspace
-usr/bin/git-submodule
-usr/bin/git-svn
-usr/bin/git-symbolic-ref
-usr/bin/git-tag
-usr/bin/git-tar-tree
-usr/bin/git-unpack-file
-usr/bin/git-unpack-objects
-usr/bin/git-update-index
-usr/bin/git-update-ref
-usr/bin/git-update-server-info
 usr/bin/git-upload-archive
 usr/bin/git-upload-pack
-usr/bin/git-var
-usr/bin/git-verify-pack
-usr/bin/git-verify-tag
-usr/bin/git-whatchanged
-usr/bin/git-write-tree
 #usr/bin/gitk
-usr/lib/perl5/site_perl/5.8.8/Error.pm
-usr/lib/perl5/site_perl/5.8.8/Git.pm
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Git
-#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Git/.packlist
+usr/lib/perl5/site_perl/5.12.3/Error.pm
+usr/lib/perl5/site_perl/5.12.3/Git
+usr/lib/perl5/site_perl/5.12.3/Git.pm
+usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist
+usr/lib/python2.7/site-packages/git_remote_helpers
+#usr/lib/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info
+usr/lib/python2.7/site-packages/git_remote_helpers/__init__.py
+usr/lib/python2.7/site-packages/git_remote_helpers/__init__.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git
+usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/git.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/git.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/util.py
+usr/lib/python2.7/site-packages/git_remote_helpers/util.pyc
+usr/libexec/git-core
+usr/libexec/git-core/git
+usr/libexec/git-core/git-add
+usr/libexec/git-core/git-add--interactive
+usr/libexec/git-core/git-am
+usr/libexec/git-core/git-annotate
+usr/libexec/git-core/git-apply
+usr/libexec/git-core/git-archimport
+usr/libexec/git-core/git-archive
+usr/libexec/git-core/git-bisect
+usr/libexec/git-core/git-bisect--helper
+usr/libexec/git-core/git-blame
+usr/libexec/git-core/git-branch
+usr/libexec/git-core/git-bundle
+usr/libexec/git-core/git-cat-file
+usr/libexec/git-core/git-check-attr
+usr/libexec/git-core/git-check-ref-format
+usr/libexec/git-core/git-checkout
+usr/libexec/git-core/git-checkout-index
+usr/libexec/git-core/git-cherry
+usr/libexec/git-core/git-cherry-pick
+usr/libexec/git-core/git-citool
+usr/libexec/git-core/git-clean
+usr/libexec/git-core/git-clone
+usr/libexec/git-core/git-commit
+usr/libexec/git-core/git-commit-tree
+usr/libexec/git-core/git-config
+usr/libexec/git-core/git-count-objects
+usr/libexec/git-core/git-credential-cache
+usr/libexec/git-core/git-credential-cache--daemon
+usr/libexec/git-core/git-credential-store
+usr/libexec/git-core/git-cvsexportcommit
+usr/libexec/git-core/git-cvsimport
+usr/libexec/git-core/git-cvsserver
+usr/libexec/git-core/git-daemon
+usr/libexec/git-core/git-describe
+usr/libexec/git-core/git-diff
+usr/libexec/git-core/git-diff-files
+usr/libexec/git-core/git-diff-index
+usr/libexec/git-core/git-diff-tree
+usr/libexec/git-core/git-difftool
+usr/libexec/git-core/git-difftool--helper
+usr/libexec/git-core/git-fast-export
+usr/libexec/git-core/git-fast-import
+usr/libexec/git-core/git-fetch
+usr/libexec/git-core/git-fetch-pack
+usr/libexec/git-core/git-filter-branch
+usr/libexec/git-core/git-fmt-merge-msg
+usr/libexec/git-core/git-for-each-ref
+usr/libexec/git-core/git-format-patch
+usr/libexec/git-core/git-fsck
+usr/libexec/git-core/git-fsck-objects
+usr/libexec/git-core/git-gc
+usr/libexec/git-core/git-get-tar-commit-id
+usr/libexec/git-core/git-grep
+usr/libexec/git-core/git-gui
+usr/libexec/git-core/git-gui--askpass
+usr/libexec/git-core/git-hash-object
+usr/libexec/git-core/git-help
+usr/libexec/git-core/git-http-backend
+usr/libexec/git-core/git-http-fetch
+usr/libexec/git-core/git-http-push
+usr/libexec/git-core/git-imap-send
+usr/libexec/git-core/git-index-pack
+usr/libexec/git-core/git-init
+usr/libexec/git-core/git-init-db
+usr/libexec/git-core/git-instaweb
+usr/libexec/git-core/git-log
+usr/libexec/git-core/git-lost-found
+usr/libexec/git-core/git-ls-files
+usr/libexec/git-core/git-ls-remote
+usr/libexec/git-core/git-ls-tree
+usr/libexec/git-core/git-mailinfo
+usr/libexec/git-core/git-mailsplit
+usr/libexec/git-core/git-merge
+usr/libexec/git-core/git-merge-base
+usr/libexec/git-core/git-merge-file
+usr/libexec/git-core/git-merge-index
+usr/libexec/git-core/git-merge-octopus
+usr/libexec/git-core/git-merge-one-file
+usr/libexec/git-core/git-merge-ours
+usr/libexec/git-core/git-merge-recursive
+usr/libexec/git-core/git-merge-resolve
+usr/libexec/git-core/git-merge-subtree
+usr/libexec/git-core/git-merge-tree
+usr/libexec/git-core/git-mergetool
+usr/libexec/git-core/git-mergetool--lib
+usr/libexec/git-core/git-mktag
+usr/libexec/git-core/git-mktree
+usr/libexec/git-core/git-mv
+usr/libexec/git-core/git-name-rev
+usr/libexec/git-core/git-notes
+usr/libexec/git-core/git-pack-objects
+usr/libexec/git-core/git-pack-redundant
+usr/libexec/git-core/git-pack-refs
+usr/libexec/git-core/git-parse-remote
+usr/libexec/git-core/git-patch-id
+usr/libexec/git-core/git-peek-remote
+usr/libexec/git-core/git-prune
+usr/libexec/git-core/git-prune-packed
+usr/libexec/git-core/git-pull
+usr/libexec/git-core/git-push
+usr/libexec/git-core/git-quiltimport
+usr/libexec/git-core/git-read-tree
+usr/libexec/git-core/git-rebase
+usr/libexec/git-core/git-rebase--am
+usr/libexec/git-core/git-rebase--interactive
+usr/libexec/git-core/git-rebase--merge
+usr/libexec/git-core/git-receive-pack
+usr/libexec/git-core/git-reflog
+usr/libexec/git-core/git-relink
+usr/libexec/git-core/git-remote
+usr/libexec/git-core/git-remote-ext
+usr/libexec/git-core/git-remote-fd
+usr/libexec/git-core/git-remote-ftp
+usr/libexec/git-core/git-remote-ftps
+usr/libexec/git-core/git-remote-http
+usr/libexec/git-core/git-remote-https
+usr/libexec/git-core/git-remote-testgit
+usr/libexec/git-core/git-repack
+usr/libexec/git-core/git-replace
+usr/libexec/git-core/git-repo-config
+usr/libexec/git-core/git-request-pull
+usr/libexec/git-core/git-rerere
+usr/libexec/git-core/git-reset
+usr/libexec/git-core/git-rev-list
+usr/libexec/git-core/git-rev-parse
+usr/libexec/git-core/git-revert
+usr/libexec/git-core/git-rm
+usr/libexec/git-core/git-send-email
+usr/libexec/git-core/git-send-pack
+usr/libexec/git-core/git-sh-i18n
+usr/libexec/git-core/git-sh-i18n--envsubst
+usr/libexec/git-core/git-sh-setup
+usr/libexec/git-core/git-shell
+usr/libexec/git-core/git-shortlog
+usr/libexec/git-core/git-show
+usr/libexec/git-core/git-show-branch
+usr/libexec/git-core/git-show-index
+usr/libexec/git-core/git-show-ref
+usr/libexec/git-core/git-stage
+usr/libexec/git-core/git-stash
+usr/libexec/git-core/git-status
+usr/libexec/git-core/git-stripspace
+usr/libexec/git-core/git-submodule
+usr/libexec/git-core/git-svn
+usr/libexec/git-core/git-symbolic-ref
+usr/libexec/git-core/git-tag
+usr/libexec/git-core/git-tar-tree
+usr/libexec/git-core/git-unpack-file
+usr/libexec/git-core/git-unpack-objects
+usr/libexec/git-core/git-update-index
+usr/libexec/git-core/git-update-ref
+usr/libexec/git-core/git-update-server-info
+usr/libexec/git-core/git-upload-archive
+usr/libexec/git-core/git-upload-pack
+usr/libexec/git-core/git-var
+usr/libexec/git-core/git-verify-pack
+usr/libexec/git-core/git-verify-tag
+usr/libexec/git-core/git-web--browse
+usr/libexec/git-core/git-whatchanged
+usr/libexec/git-core/git-write-tree
+usr/libexec/git-core/mergetools
+usr/libexec/git-core/mergetools/araxis
+usr/libexec/git-core/mergetools/bc3
+usr/libexec/git-core/mergetools/defaults
+usr/libexec/git-core/mergetools/diffuse
+usr/libexec/git-core/mergetools/ecmerge
+usr/libexec/git-core/mergetools/emerge
+usr/libexec/git-core/mergetools/kdiff3
+usr/libexec/git-core/mergetools/kompare
+usr/libexec/git-core/mergetools/meld
+usr/libexec/git-core/mergetools/opendiff
+usr/libexec/git-core/mergetools/p4merge
+usr/libexec/git-core/mergetools/tkdiff
+usr/libexec/git-core/mergetools/tortoisemerge
+usr/libexec/git-core/mergetools/vim
+usr/libexec/git-core/mergetools/xxdiff
 usr/share/git-core
 usr/share/git-core/templates
 usr/share/git-core/templates/branches
 usr/share/git-core/templates/description
 usr/share/git-core/templates/hooks
-usr/share/git-core/templates/hooks/applypatch-msg
-usr/share/git-core/templates/hooks/commit-msg
-usr/share/git-core/templates/hooks/post-commit
-usr/share/git-core/templates/hooks/post-receive
-usr/share/git-core/templates/hooks/post-update
-usr/share/git-core/templates/hooks/pre-applypatch
-usr/share/git-core/templates/hooks/pre-commit
-usr/share/git-core/templates/hooks/pre-rebase
-usr/share/git-core/templates/hooks/update
+usr/share/git-core/templates/hooks/applypatch-msg.sample
+usr/share/git-core/templates/hooks/commit-msg.sample
+usr/share/git-core/templates/hooks/post-update.sample
+usr/share/git-core/templates/hooks/pre-applypatch.sample
+usr/share/git-core/templates/hooks/pre-commit.sample
+usr/share/git-core/templates/hooks/pre-rebase.sample
+usr/share/git-core/templates/hooks/prepare-commit-msg.sample
+usr/share/git-core/templates/hooks/update.sample
 usr/share/git-core/templates/info
 usr/share/git-core/templates/info/exclude
 #usr/share/git-gui
@@ -182,23 +247,35 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/error.tcl
 #usr/share/git-gui/lib/git-gui.ico
 #usr/share/git-gui/lib/index.tcl
+#usr/share/git-gui/lib/line.tcl
 #usr/share/git-gui/lib/logo.tcl
 #usr/share/git-gui/lib/merge.tcl
+#usr/share/git-gui/lib/mergetool.tcl
 #usr/share/git-gui/lib/msgs
 #usr/share/git-gui/lib/msgs/de.msg
+#usr/share/git-gui/lib/msgs/el.msg
 #usr/share/git-gui/lib/msgs/fr.msg
 #usr/share/git-gui/lib/msgs/hu.msg
 #usr/share/git-gui/lib/msgs/it.msg
 #usr/share/git-gui/lib/msgs/ja.msg
+#usr/share/git-gui/lib/msgs/nb.msg
+#usr/share/git-gui/lib/msgs/pt_br.msg
 #usr/share/git-gui/lib/msgs/ru.msg
 #usr/share/git-gui/lib/msgs/sv.msg
 #usr/share/git-gui/lib/msgs/zh_cn.msg
 #usr/share/git-gui/lib/option.tcl
 #usr/share/git-gui/lib/remote.tcl
+#usr/share/git-gui/lib/remote_add.tcl
 #usr/share/git-gui/lib/remote_branch_delete.tcl
+#usr/share/git-gui/lib/search.tcl
 #usr/share/git-gui/lib/shortcut.tcl
+#usr/share/git-gui/lib/spellcheck.tcl
+#usr/share/git-gui/lib/sshkey.tcl
 #usr/share/git-gui/lib/status_bar.tcl
 #usr/share/git-gui/lib/tclIndex
+#usr/share/git-gui/lib/themed.tcl
+#usr/share/git-gui/lib/tools.tcl
+#usr/share/git-gui/lib/tools_dlg.tcl
 #usr/share/git-gui/lib/transport.tcl
 #usr/share/git-gui/lib/win32.tcl
 #usr/share/git-gui/lib/win32_shortcut.js
@@ -206,5 +283,22 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib
 #usr/share/gitk/lib/msgs
 #usr/share/gitk/lib/msgs/de.msg
+#usr/share/gitk/lib/msgs/es.msg
+#usr/share/gitk/lib/msgs/fr.msg
+#usr/share/gitk/lib/msgs/hu.msg
+#usr/share/gitk/lib/msgs/it.msg
+#usr/share/gitk/lib/msgs/ja.msg
+#usr/share/gitk/lib/msgs/pt_br.msg
+#usr/share/gitk/lib/msgs/ru.msg
+#usr/share/gitk/lib/msgs/sv.msg
+#usr/share/gitweb
+#usr/share/gitweb/gitweb.cgi
+#usr/share/gitweb/static
+#usr/share/gitweb/static/git-favicon.png
+#usr/share/gitweb/static/git-logo.png
+#usr/share/gitweb/static/gitweb.css
+#usr/share/gitweb/static/gitweb.js
+#usr/share/locale/is/LC_MESSAGES/git.mo
 #usr/share/man/man3/Git.3
+#usr/share/man/man3/Git::I18N.3
 #usr/share/man/man3/private-Error.3