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 a555c3f8ff6d82b9c85a8f238ad6d131a3d902bc..a2691df55536d5a6bcdcd97d8f65fbd66acf5ca8 100644 (file)
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -1,13 +1,37 @@
 usr/bin/git
+usr/bin/git-cvsserver
 usr/bin/git-receive-pack
+usr/bin/git-shell
 usr/bin/git-upload-archive
 usr/bin/git-upload-pack
 #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
@@ -16,6 +40,7 @@ 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
@@ -33,6 +58,9 @@ 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
@@ -42,10 +70,11 @@ 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--tool
 usr/libexec/git-core/git-fetch-pack
 usr/libexec/git-core/git-filter-branch
 usr/libexec/git-core/git-fmt-merge-msg
@@ -57,7 +86,10 @@ 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
@@ -84,10 +116,12 @@ 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
@@ -101,12 +135,22 @@ 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
@@ -117,6 +161,8 @@ 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
@@ -124,6 +170,7 @@ 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
@@ -145,6 +192,22 @@ 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
@@ -152,8 +215,6 @@ usr/share/git-core/templates/description
 usr/share/git-core/templates/hooks
 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-commit.sample
-usr/share/git-core/templates/hooks/post-receive.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
@@ -186,24 +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
@@ -212,7 +284,21 @@ usr/share/git-core/templates/info/exclude
 #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