summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-01 18:58:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-08-01 19:01:01 (GMT)
commitd50cb7569cfb6e04ba48900821618d28012f334e (patch)
tree641264cefb155981b8861759cd39665ffcd04cd2 /builtin
parent898bbe9664bf99bea6dcd4d03b2480f0f79b404b (diff)
parent98e023dea40a0eca8a61c037dfc59aaf27f003a4 (diff)
downloadgit-d50cb7569cfb6e04ba48900821618d28012f334e.zip
git-d50cb7569cfb6e04ba48900821618d28012f334e.tar.gz
git-d50cb7569cfb6e04ba48900821618d28012f334e.tar.bz2
Merge branch 'ob/typofixes'
* ob/typofixes: many small typofixes
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fast-export.c2
-rw-r--r--builtin/push.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d1d68e9..8e19058 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -379,7 +379,7 @@ static void handle_tag(const char *name, struct tag *tag)
int tagged_mark;
struct commit *p;
- /* Trees have no identifer in fast-export output, thus we have no way
+ /* Trees have no identifier in fast-export output, thus we have no way
* to output tags of trees, tags of tags of trees, etc. Simply omit
* such tags.
*/
diff --git a/builtin/push.c b/builtin/push.c
index 6d36c24..04f0eaf 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -92,7 +92,7 @@ static NORETURN int die_push_simple(struct branch *branch, struct remote *remote
if (!short_upstream)
short_upstream = branch->merge[0]->src;
/*
- * Don't show advice for people who explicitely set
+ * Don't show advice for people who explicitly set
* push.default.
*/
if (push_default == PUSH_DEFAULT_UNSPECIFIED)