summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 23:36:01 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 23:36:39 +0000
commit86ac87e912207b272c8159d03359459fc55eefba (patch)
tree02de4fe6587bfb2b55e217b9f2f97145bcca6411
parentee8bb6a7f4f808b5cb798897c0d5995ce1da888d (diff)
dgit-nmu-simple(7): Mention vcs-git
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--dgit-nmu-simple.7.pod24
1 files changed, 24 insertions, 0 deletions
diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod
index f1e8543..b30934f 100644
--- a/dgit-nmu-simple.7.pod
+++ b/dgit-nmu-simple.7.pod
@@ -108,6 +108,30 @@ tree.
It also means you don't care about the package clean target,
which is just as well because many package clean targets are broken.
+=head1 OTHER GIT BRANCHES
+
+The dgit git history
+(visible in gitk and git log)
+is not necessarily related to the maintainer's
+or upstream's git history (if any).
+
+If the maintainer has advertised a git repo with
+Vcs-Git
+dgit will set up a remote for it,
+so you can do
+
+=over 4
+
+ % git fetch vcs-git
+
+=back
+
+You can cherry pick changes from there, for example.
+Note that the maintainer's git history may not be
+suitable for use with dgit.
+For example, it might be a patches-unapplied branch
+or even contain only a debian/ directory.
+
=head1 UPLOADING TO DELAYED
You can use dgit's I<--delayed> option