Packaging Workflow with Git

1. Definitions

Create an empty git repository

$ mkdir program
$ cd program
$ git init --shared

Import upstream into git

$ git add .
$ git commit -a -m "Adding upstream version version."
$ git tag -a -m "Tagging upstream version version." upstream/version

Create upstream branch (by renaming master)
```
$ git branch -m master upstream
```

Import pristine-tar delta

$ pristine-tar commit -m "Adding pristine-tar version version." ../program_version.orig.tar.gz

Prepare bare git repository

$ cd ..
$ git clone --bare program program.git
$ cd program.git

Upload git repository to alioth

$ scp -r program.git username@alioth.debian.org:/git/project

Remember to make sure that the files on alioth do have read-write permissions for your alioth group.

Checkout repository

$ git clone ssh://username@git.debian.org/git/project/package.git

Checkout branches

$ cd package

$ git checkout -b upstream origin/upstream
$ git checkout -b pristine-tar origin/pristine-tar

Make sure that you are on the debian branch
```
$ cd package

$ git checkout debian
```
Do your modifications on the package here. Remember to not touch debian/changelog at all, it will be later automatically generated from the git log.
Commit changes
```
$ git commit -a -m "My commit message."
```
After a bunch of commits, you push changes
```
$ git push
```

Adding files

$ git add .
$ git commit -a -m "Adding upstream version version."

Tagging

$ git tag -a -m "Tagging upstream version version." upstream/version

Upstream tarball

$ pristine-tar commit -m "Adding pristine-tar version version." ../package_version.orig.tar.gz

Merging

$ git cherry-pick -n upstream
$ git commit -a -m "Merging upstream version version."

Creating changelog

$ git-dch --debian-branch debian --release --since HASH

Releasing

$ git commit -a -m "Releasing debian version version-revision."

Tagging

$ git tag -a -m "Tagging debian version version-revision." debian/version-revision

Upstream tarball

$ pristine-tar checkout package_version.orig.tar.gz