aboutsummaryrefslogtreecommitdiff
path: root/docs/chapters/releases.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'docs/chapters/releases.sgml')
-rw-r--r--docs/chapters/releases.sgml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/chapters/releases.sgml b/docs/chapters/releases.sgml
index 07195a15..1509ae10 100644
--- a/docs/chapters/releases.sgml
+++ b/docs/chapters/releases.sgml
@@ -2,7 +2,7 @@
<title>Releases and Snapshots</title>
<para>When branching and merging frequently, the different Debian changelog
entries on the different branches tend to get into the way of the automatic
- merge and the the merge fails - leaving the (patholigical) merge to the
+ merge and the the merge fails - leaving the (pathological) merge to the
committer. In order to avoid this &git-dch; offers a way for creating
changelog entries from &git; commits before doing a
release or anytime between releases.</para>