diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2017-05-14 14:26:09 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2017-05-14 14:26:09 -0300 |
commit | c31d9f1126dd87fefc5d36673a03ddfa753bf2b4 (patch) | |
tree | f34baceae0554004ba8200d7e6073e3e48c3ada1 | |
parent | fc6d705e67aaf7489c3465d7cab85dd57b81b0f7 (diff) | |
download | utils-git-c31d9f1126dd87fefc5d36673a03ddfa753bf2b4.tar.gz utils-git-c31d9f1126dd87fefc5d36673a03ddfa753bf2b4.tar.bz2 |
Auto fetch changes on commit, fix staging check
-rwxr-xr-x | commit | 3 | ||||
-rwxr-xr-x | commit-updates | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -131,6 +131,8 @@ function git_commit { # If there are no staged files, commit everything. # Otherwise commit just what was staged if git status --short | grep -q "^[AM]"; then + flag="" + else flag="-a" fi @@ -148,5 +150,6 @@ if [ ! -z "$1" ]; then git_user git_commit $* git_push + git fetch --all fi fi diff --git a/commit-updates b/commit-updates index b033348..082727d 100755 --- a/commit-updates +++ b/commit-updates @@ -13,11 +13,9 @@ if git status &> /dev/null; then else commit "Updates $(basename `pwd`)" fi - - git fetch --all else if [ ! -z "$1" ] && [ -d "$1" ]; then - ( cd $1 &> /dev/null && commit "Updates $(basename $1)" && git fetch --all ) + ( cd $1 &> /dev/null && commit "Updates $(basename $1)" ) else mr commit -m "Updates" mr fetch |