summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-06-27 15:32:05 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-06-28 00:56:43 +0200
commit9aedd918d38ce3bd4f8893b37b6d68bfb4aa99b1 (patch)
tree4df412a93a0a07e99a03991306c617f7d62aecee
parentcb47d89bbba78e370a420d4f15b631c9ce7532c8 (diff)
downloadcoreboot-9aedd918d38ce3bd4f8893b37b6d68bfb4aa99b1.tar.xz
gitmodules: Fix 3rdparty updates
Commit 039223a: gitmodules: Ignore 3rdparty in "diff family" changed the behavior of our 3rdparty repository and disallowed updates to the checked out hash. Instead of "ignore=all" we want "ignore=dirty" to ignore local changes but allow changing to the HEAD of the 3rdparty repo. Change-Id: I66c35ad4fcfb0efb0ba611f67648a096a6de1479 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/3566 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--.gitmodules2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 25ba6e3c67..8702ff0e07 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,4 +2,4 @@
path = 3rdparty
url = ../blobs.git
update = none
- ignore = all
+ ignore = dirty