diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-21 22:51:29 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-21 22:51:29 -0700 |
commit | 80f074396d2a5601cdbf643f9b0db09329070a3f (patch) | |
tree | 7edfc74b4d4ebccc7f2e7b4b288fce3b21b9fec0 /builtin | |
parent | 8c091d918de73e4600a93088ee0f702224ba99c3 (diff) | |
parent | 09b7e2204a8e41307192c800162e438ec09ddd2c (diff) | |
download | git-80f074396d2a5601cdbf643f9b0db09329070a3f.tar.gz |
Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint
* ph/builtin-srcs-are-in-subdir-these-days:
fix "builtin-*" references to be "builtin/*"
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/help.c | 2 | ||||
-rw-r--r-- | builtin/notes.c | 2 | ||||
-rw-r--r-- | builtin/replace.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/builtin/help.c b/builtin/help.c index 062957f629..f1e236b912 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -1,6 +1,4 @@ /* - * builtin-help.c - * * Builtin help command */ #include "cache.h" diff --git a/builtin/notes.c b/builtin/notes.c index 57748a6fb6..d9a67d9de4 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -4,7 +4,7 @@ * Copyright (c) 2010 Johan Herland <johan@herland.net> * * Based on git-notes.sh by Johannes Schindelin, - * and builtin-tag.c by Kristian Høgsberg and Carlos Rica. + * and builtin/tag.c by Kristian Høgsberg and Carlos Rica. */ #include "cache.h" diff --git a/builtin/replace.c b/builtin/replace.c index 398ccd5eaa..59d31152d0 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -3,7 +3,7 @@ * * Copyright (c) 2008 Christian Couder <chriscool@tuxfamily.org> * - * Based on builtin-tag.c by Kristian Høgsberg <krh@redhat.com> + * Based on builtin/tag.c by Kristian Høgsberg <krh@redhat.com> * and Carlos Rica <jasampler@gmail.com> that was itself based on * git-tag.sh and mktag.c by Linus Torvalds. */ |