summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-26 09:52:33 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-26 09:52:33 -0700
commitaba5f57c8fbb04abc5d286310969c1f767793930 (patch)
tree46f957c1a1cc146f7ed0d53876d9e963079ec77e
parentb1bcfbe34439ff6d1a04d0bddb01eebe4df418a5 (diff)
parent8258858493ad3504630c3bfa7dfde61df811994a (diff)
downloadgit-aba5f57c8fbb04abc5d286310969c1f767793930.tar.gz
Sync with 1.7.7.7
-rw-r--r--Documentation/RelNotes/1.7.7.7.txt13
-rw-r--r--Documentation/git.txt3
-rw-r--r--bundle.c2
3 files changed, 16 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.7.7.txt b/Documentation/RelNotes/1.7.7.7.txt
new file mode 100644
index 0000000000..e79118d063
--- /dev/null
+++ b/Documentation/RelNotes/1.7.7.7.txt
@@ -0,0 +1,13 @@
+Git v1.7.7.7 Release Notes
+==========================
+
+Fixes since v1.7.7.6
+--------------------
+
+ * An error message from 'git bundle' had an unmatched single quote pair in it.
+
+ * 'git diff --histogram' option was not described.
+
+ * 'git imap-send' carried an unused dead code.
+
+Also contains minor fixes and documentation updates.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 614693a83f..e71a0d1d32 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -53,9 +53,10 @@ Documentation for older releases are available here:
link:RelNotes/1.7.8.1.txt[1.7.8.1],
link:RelNotes/1.7.8.txt[1.7.8].
-* link:v1.7.7.6/git.html[documentation for release 1.7.7.6]
+* link:v1.7.7.7/git.html[documentation for release 1.7.7.7]
* release notes for
+ link:RelNotes/1.7.7.7.txt[1.7.7.7],
link:RelNotes/1.7.7.6.txt[1.7.7.6],
link:RelNotes/1.7.7.5.txt[1.7.7.5],
link:RelNotes/1.7.7.4.txt[1.7.7.4],
diff --git a/bundle.c b/bundle.c
index 6c4695eb91..0d22f23dd7 100644
--- a/bundle.c
+++ b/bundle.c
@@ -289,7 +289,7 @@ int create_bundle(struct bundle_header *header, const char *path,
argc = setup_revisions(argc, argv, &revs, NULL);
if (argc > 1)
- return error("unrecognized argument: %s'", argv[1]);
+ return error("unrecognized argument: %s", argv[1]);
object_array_remove_duplicates(&revs.pending);