X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=blobdiff_plain;f=talk.txt;fp=talk.txt;h=5e6bc206645391c7c17d3957cb8de99cd7ed3c78;hb=08ba9e11feceacb45309cea189ee904e3d376cf7;hp=2bc423d3949b4f0ccb5b7beeeb2ba2be1e9e4ac9;hpb=c60afcf73560c612262a2423bdec4dbe1c6884bd;p=talk-2015-debconf-dgit.git diff --git a/talk.txt b/talk.txt index 2bc423d..5e6bc20 100644 --- a/talk.txt +++ b/talk.txt @@ -293,11 +293,18 @@ conflicts, which do occur occasionally if you do this, are easily resolved by rerunning autotools. -And a second way dgit's rule can bite is that it is normally best to -use one of dgit's build operations to build for upload. This is -mainly because most other tools remove .gitignore by default. dgit -requires that the source package and git tree are the same, so if your -git tree has .gitignore in it, your source package should too. +And a second way dgit's rule can bite is .gitignore. Most existing +packaging tools remove .gitignore from source packages by default. +But, dgit dgit requires that the source package and git tree are the +same, so if your git tree has .gitignore in it, your source package +should too. + +==== manpage slide + +So it is normally best to use one of dgit's build operations to build +for upload; in generally, all that those build operations do +differently to the underlying tool, is pass some appropriate -I +options, to exclude exactly and only the .git directory. Finally, there is one compelling advantage of dgit's git-based