Hi all,I would like to suggest some Git specific handlings in our development workflow now that we have migrated most D-E projects to Git:
1. Make sure you always do "git pull --rebase". This will keep the commit history in order, even if we pull from origin while we already have local commits in our local working copy. The --rebase option can be put into ~/.gitconfig  2. Let's drop the habit of accompanying an entry to debian/changelog with each Git commit. This makes rebasing very hard (because every rebase step will very likely let pop up a conflict in debian/changelog). 3. Let's use Git history to compose our later debian/changelog stanza instead. With such an approach the debian/changelog file gets created just before the upload to unstable (the tool "git dch --auto" will be the uploader's friend).With such an approach (auto-generate debian/changelog just before upload) we ease our daily work with Git. Tasks like branching off, merging in branches, rebasing, non-merge pulls, etc. become much smoother.
Comments? Input? Mike  ~/.gitconfig, add these lines to switch on rebasing on git pull by default """ [pull] rebase = true """ -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: firstname.lastname@example.org, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
Description: Digitale PGP-Signatur