(artful-cifs-utils-merge-1710688|REBASE-i 1/1)andreas@nsn7:~/git/packages/cifs-utils$ git st -v
interactive rebase in progress; onto f5496fb
Last command done (1 command done):
e ed762de Import patches-unapplied version 2:6.6-5ubuntu1 to ubuntu/zesty-proposed
No commands remaining.
You are currently splitting a commit while rebasing branch 'artful-cifs-utils-merge-1710688' on 'f5496fb'.
(Once your working directory is clean, run "git rebase --continue")
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: debian/changelog
modified: debian/control
modified: debian/postinst.in
modified: debian/prerm.in
Untracked files:
(use "git add <file>..." to include in what will be committed)
debian/patches/
no changes added to commit (use "git add" and/or "git commit -a")
(artful-cifs-utils-merge-1710688|REBASE-i 1/1)andreas@nsn7:~/git/packages/cifs-utils$ git diff|tail
+XSBC-Original-Maintainer: Debian Samba Maintainers <pkg-samba-maint@lists.alioth.debian.org>
Uploaders: Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>, Noèl Köthe <noel@debian.org>, Jelmer Vernooij <jelmer@debian.org>, Mathieu Parent <sathieu@debian.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
diff --git a/debian/postinst.in b/debian/postinst.in
old mode 100755
new mode 100644
diff --git a/debian/prerm.in b/debian/prerm.in
old mode 100755
new mode 100644
ote: checking out 'new/debian'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b <new-branch-name>
HEAD is now at e9084a9... Import patches-unapplied version 2:6.7-1 to debian/sid
((importer/import/2%6.7-1))andreas@nsn7:~/git/packages/cifs-utils$ l debian/
total 20K
drwxrwxr-x 4 andreas andreas 16 Ago 14 16:52 .
drwxrwxr-x 8 andreas andreas 58 Ago 14 16:52 ..
-rw-rw-r-- 1 andreas andreas 7,4K Ago 14 16:52 changelog
-rw-rw-r-- 1 andreas andreas 57 Ago 14 16:27 cifs-utils.lintian-overrides
-rw-rw-r-- 1 andreas andreas 2 Ago 14 16:27 compat
-rw-rw-r-- 1 andreas andreas 1,2K Ago 14 16:52 control
-rw-rw-r-- 1 andreas andreas 2,6K Ago 14 16:27 copyright
-rw-rw-r-- 1 andreas andreas 16 Ago 14 16:27 dirs
-rw-rw-r-- 1 andreas andreas 84 Ago 14 16:27 gbp.conf
-rw-rw-r-- 1 andreas andreas 113 Ago 14 16:27 install
-rwxrwxr-x 1 andreas andreas 343 Ago 14 16:52 postinst.in
-rwxrwxr-x 1 andreas andreas 166 Ago 14 16:52 prerm.in
-rwxrwxr-x 1 andreas andreas 753 Ago 14 16:27 rules
drwxrwxr-x 2 andreas andreas 3 Ago 14 16:27 source
drwxrwxr-x 2 andreas andreas 3 Ago 14 16:27 upstream
-rw-rw-r-- 1 andreas andreas 118 Ago 14 16:27 watch