Index: quilt/doc/main.tex =================================================================== --- quilt.orig/doc/main.tex 2005-06-12 15:19:41.000000000 +0200 +++ quilt/doc/main.tex 2005-06-12 15:53:38.961393029 +0200 @@ -516,6 +516,24 @@ } and then applying the patch to the working tree. The \quilt{fold} command combines these steps. +\subsection{Sharing your patches} + +You may sometimes need to share your patches with someone else, or +reapply them on another instance of your software. As quilt patches are all +contained in the \textsf{patches} directory, you just need to distribute +this directory, making sure your patches are properly refreshed. +You can also export all your patches in a single patch file using +\quilt{diff --combine}. + +\subsection{Merging with upstream} + +The concept of merging your patches with upstream is identical to applying +your patches on a more recent version of the software. + +First, make sure to pop all your patches using \quilt{pop -a}. Then update +your codebase. Finally remove the obsoleted patches and \quilt{push} all +remaining ones, refreshing and fixing those in need. + \subsection{Forking} \label{sec:forking}