Merge branch 'sb/maint-pull-rebase'

diff --git a/builtin-reflog.c b/builtin-reflog.c
index 249ad2a311f2e9680618870aed3ac053c9fcf7a1..95198c5de41072bfb8adf7f29d9bbb44eec665ac 100644 (file)
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -240,10 +240,10 @@ static int unreachable(struct expire_reflog_cb *cb, struct commit *commit, unsig
 static void mark_reachable(struct commit *commit, unsigned long expire_limit)
 {
        /*
-        * We need to compute if commit on either side of an reflog
+        * We need to compute whether the commit on either side of a reflog
         * entry is reachable from the tip of the ref for all entries.
         * Mark commits that are reachable from the tip down to the
-        * time threashold first; we know a commit marked thusly is
+        * time threshold first; we know a commit marked thusly is
         * reachable from the tip without running in_merge_bases()
         * at all.
         */
@@ -694,7 +694,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
  */
 
 static const char reflog_usage[] =
-"git reflog (expire | ...)";
+"git reflog [ show | expire | delete ]";
 
 int cmd_reflog(int argc, const char **argv, const char *prefix)
 {