Use FETCH_HEAD to know where to rebase to after pull.

[stgit] / setup.py

diff --git a/setup.py b/setup.py
index 1a7a3f011088887d9e8e27ba5266c6adde33c6af..cf5b1da37d2813ce2f0756e45a1522e8e10e9f23 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,14 +9,17 @@ setup(name = 'stgit',
       version = version,
       license = 'GPLv2',
       author = 'Catalin Marinas',
       version = version,
       license = 'GPLv2',
       author = 'Catalin Marinas',

-      author_email = 'catalin.marinas@gmail.org',
+      author_email = 'catalin.marinas@gmail.com',

       url = 'http://www.procode.org/stgit/',
       description = 'Stacked GIT',
       long_description = 'Push/pop utility on top of GIT',
       url = 'http://www.procode.org/stgit/',
       description = 'Stacked GIT',
       long_description = 'Push/pop utility on top of GIT',

-      scripts = ['stg', 'gitmergeonefile.py'],
+      scripts = ['stg'],

       packages = ['stgit', 'stgit.commands'],
       data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
                     ('share/stgit/examples', glob.glob('examples/*.tmpl')),
       packages = ['stgit', 'stgit.commands'],
       data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
                     ('share/stgit/examples', glob.glob('examples/*.tmpl')),

-                    ('share/stgit/examples', ['examples/stgitrc']),
+                    ('share/stgit/examples', ['examples/gitconfig']),
+                    ('share/stgit/contrib', ['contrib/diffcol.sh',
+                                             'contrib/stgbashprompt.sh',
+                                             'contrib/stgit-completion.bash']),

                     ('share/doc/stgit', glob.glob('doc/*.txt'))]
       )
                     ('share/doc/stgit', glob.glob('doc/*.txt'))]
       )