Merge branch 'jk/fetch-reflog-df-conflict'

diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index a50896f0dc6093d46ee513f2f21f51963ee36c20..a5c3381b6938a6f06ab3519abc902b37c22a92ad 100644 (file)
--- a/Documentation/RelNotes/2.2.0.txt
+++ b/Documentation/RelNotes/2.2.0.txt
@@ -85,7 +85,7 @@ UI, Workflows & Features
    public repository really point the commits the pusher wanted to,
    without having to "trust" the server.
 
- * "git interpret-trailers" is a new filter to programatically edit
+ * "git interpret-trailers" is a new filter to programmatically edit
     the tail end of the commit log messages.
 
  * "git help everyday" shows the "Everyday Git in 20 commands or so"