X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;h=16c0a0110ab9e6f22a711f9c42790c712c4d7804;hp=a21f212dc94382ae528a028254122585a7b15937;hb=678da9f114859fe07899f72c81336f228ad40717;hpb=51a3f746ef8525c1a24085b97e28cc36c85b1268 diff --git a/dgit.1 b/dgit.1 index a21f212d..16c0a011 100644 --- a/dgit.1 +++ b/dgit.1 @@ -346,6 +346,8 @@ For why, see .B GITATTRIBUTES in .BR dgit(7) . +Note that only attributes affecting the working tree are suppressed. +git-archive may remain exciting. If there is an existing macro attribute line .B [attr]dgit-defuse-attrs @@ -604,6 +606,13 @@ your git branch is not a descendant of the version in the archive according to the git revision history. +It is safer not to specify +.IR previous-version , +and usually it's not needed. +Just say +.BR --overwrite , +unless you know what you are doing. + This option is useful if you are the maintainer, and you have incorporated NMU changes into your own git workflow in a way that doesn't make your branch a fast forward from the NMU.