summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2008-12-23 21:54:39 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2008-12-23 21:54:39 +0100
commitba21ff1fee59845e4b6dfdf085a50470c7b9dcf5 (patch)
tree9211d4f21d43a5f44bb7d959553ca82666374f51
parent45b30c3d586cb32c2848a5582ffe509ff74084c5 (diff)
Revert "bin/pkg: Don't explicitly operate on branch master"
This reverts commit 45b30c3d586cb32c2848a5582ffe509ff74084c5. (not specifying master confuses git since it doesn't know what branch to merge with)
-rwxr-xr-xbin/pkg4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/pkg b/bin/pkg
index 7e8a7b6..f1a7ddc 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -229,11 +229,11 @@ function vcs_log {
}
function vcs_upgrade {
- git pull $PKG_ROOT/${PWD:t}
+ git pull $PKG_ROOT/${PWD:t} master
}
function vcs_push {
- git push $PKG_ROOT/${PWD:t}
+ git push $PKG_ROOT/${PWD:t} master
}
function vcs_status {