summaryrefslogtreecommitdiff
path: root/util/scripts/cross-repo-cherrypick
diff options
context:
space:
mode:
authorJett Rink <jettrink@chromium.org>2019-05-17 07:36:47 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-05-20 14:44:08 +0000
commit1eeb94ff4acf09959794a2ac1d92e685633aab18 (patch)
tree47b19b1744e828d71b8edae06be58e91420b3378 /util/scripts/cross-repo-cherrypick
parent2e585a12a247e7993c45aa887b9f4c22e63ccbed (diff)
util/scripts: update references to cross-repo-cherrypick
It appears that the rebase.sh script was renamed to cross-repo-cherrypick and changed directories. Update comments to reflect that change. Change-Id: I863df48378feb48c9b195b1778dcaf1972a4f105 Signed-off-by: Jett Rink <jettrink@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32849 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util/scripts/cross-repo-cherrypick')
-rwxr-xr-xutil/scripts/cross-repo-cherrypick6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 38d4f46fe7..42b05b5131 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -1,6 +1,6 @@
#!/bin/sh
-# rebase.sh - rebase helper script
+# cross-repo-cherrypick - rebase helper script
#
# Copyright 2015, 2017 Google Inc.
#
@@ -22,8 +22,8 @@ BRANCH="origin/master"
# git remote add ...
# git checkout -b upstreaming
# git cherry-pick ...
-# git rebase -i --exec util/gitconfig/rebase.sh master
-# Alternatively, you can run util/gitconfig/rebase.sh after every
+# git rebase -i --exec util/scripts/cross-repo-cherrypick master
+# Alternatively, you can run util/scripts/cross-repo-cherrypick after every
# individual cherry-pick.
# use $0 --cros to add a stub BUG/BRANCH/TEST block