aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-03 23:50:54 -0700
committerJunio C Hamano <gitster@pobox.com>2007-11-03 23:50:54 -0700
commit2515f935b9c1a0afa1b555f173a37d6ad7878fff (patch)
tree98d3b3bd6c8ba32c6508cc3bfc0b43cb68da9cd4 /Documentation
parent2e7a9785c27f00a8f7a06edc1d4c9b2f3fa2eeb9 (diff)
parentee787400de25ed419f40e70698ba35db475b2d61 (diff)
downloadgit-2515f935b9c1a0afa1b555f173a37d6ad7878fff.tar.gz
git-2515f935b9c1a0afa1b555f173a37d6ad7878fff.tar.xz
Merge branch 'maint'
* maint: RelNotes-1.5.3.5: fix typo Delay pager setup in git blame git-cvsimport: really convert underscores in branch names to dots with -u
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.3.5.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt
index 4e46d2c2a..f99a2cd65 100644
--- a/Documentation/RelNotes-1.5.3.5.txt
+++ b/Documentation/RelNotes-1.5.3.5.txt
@@ -63,8 +63,8 @@ Fixes since v1.5.3.4
* Git segfaulted when reading an invalid .gitattributes file. Fixed.
- * post-receive-email example hook fixed was fixed for
- non-fast-forward updates.
+ * post-receive-email example hook was fixed for non-fast-forward
+ updates.
* Documentation updates for supported (but previously undocumented)
options of "git-archive" and "git-reflog".