diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2016-10-06 13:21:17 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-10-13 18:21:17 +0200 |
| commit | 165af1c5c207f3456c4251dd6da1baae6f5ff319 (patch) | |
| tree | 41b568db1a655510124d203d7af3ae27bbe38e40 | |
| parent | d770bad317417bf37fcad1c0698ed54cfe4830ba (diff) | |
gitconfig: Allow user name and email to be in includes
This patch adds '--includes' option to 'git config --global' command
to allow user name and email to be defined in a file included from
the global gitconfig (~/.gitconfig) file.
BUG=none
BRANCH=none
TEST=make gitconfig with ~/.gitconfig including another file which
defines user.name and email.
Change-Id: I4fe61078b143c3a2e26b0be69c3ca8e6f069d8b0
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://review.coreboot.org/16912
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | Makefile.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc index c7f1d04068..127f3722a6 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -573,7 +573,7 @@ gitconfig: git config remote.origin.push HEAD:refs/for/master git config alias.sup '!git submodule update --remote --rebase && git submodule update --init --checkout' git config alias.sup-destroy '!git submodule deinit --force "$$(git rev-parse --show-toplevel)"; git submodule init && git submodule update --checkout' - (git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1) + (git config --global --includes user.name >/dev/null && git config --global --includes user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1) include util/crossgcc/Makefile.inc |