Message ID | 7779afa67f6aa012e062a76f71c1d701ef2082c8.1453985388.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/dim b/dim index fa6e896aaf46..a2c0d74c37e8 100755 --- a/dim +++ b/dim @@ -406,7 +406,7 @@ function dim_apply_branch eval $DRY $DIM_POST_APPLY_ACTION } -function magic_patch +function dim_magic_patch { if [[ "$1" = "-a" ]]; then cd `cat ~/.dim-last-path` @@ -828,7 +828,7 @@ case "$subcommand" in git am --whitespace=fix -3 -s ;; magic-patch|mp) - magic_patch "$@" + dim_magic_patch "$@" ;; magic-rebase-resolve|mrr) git diff HEAD | patch -p1 -R
Add dim_ prefix to functions corresponding to subcommands. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- dim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)