Changeset 3440 for trunk


Ignore:
Timestamp:
Sep 25, 2024, 5:51:15 PM (3 months ago)
Author:
afalco
Message:

general: interactive git svn dcommit.
AF

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/UTIL/pre-push

    r3415 r3440  
    55local_branch=$(git branch --show-current)
    66if [ ${local_branch} != "master" ]; then
    7     git checkout master # ensure master is in sync with svn
     7    # exit 0 # if on other branch than master, do not sync with svn
     8    git checkout master
     9    git pull origin master
    810fi
    911# git update-ref refs/remotes/git-svn refs/remotes/origin/master # what's this supposed to do?
     
    4547
    4648### commit changes to svn
    47 git svn dcommit
     49git svn dcommit < /dev/tty
    4850COMMITED=$?
    4951if [ $COMMITED != 0 ] # check if rebase worked
Note: See TracChangeset for help on using the changeset viewer.