X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.1;h=d23dde01384c166d71717f2955c104335a3f699d;hb=af383382f97e6ab687b209e9117fe50dac6d37c8;hp=b1bf0acc1ed9cfe080afda7fe55d9898d2a38f27;hpb=9e94228f893936a65dea1a05758e523dc7e7d22f;p=dgit.git diff --git a/dgit.1 b/dgit.1 index b1bf0acc..d23dde01 100644 --- a/dgit.1 +++ b/dgit.1 @@ -354,7 +354,7 @@ If there is an existing macro attribute line in .git/info/attributes, but it is insufficient, because it was made by an earlier version of dgit -and git has since introduced new transforming attributes; +and git has since introduced new transforming attributes, this modifies the macro to disable the newer transformations. (If there is already a macro attribute line @@ -448,7 +448,7 @@ and dgit actually imports the dsc dgit will make a pseudomerge so that the result is necessarily fast forward from the existing branch. -Otherwise, if the branch already exists, +Otherwise, if \fIbranch\fR already exists, dgit will stop with an error message. If