yeuser
/ rebase-my-branches.sh
Last active
September 10, 2020 13:59
This sh file helps you when you work in a strict rebase-then-merge git policy environment. This would essentially keep the chronology of your commits even after they are rebased.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| set -e | |
| changes=`git status -s | grep -v "??" | wc -l` | |
| if [ "$changes" -gt "0" ]; then | |
| echo "found $changes local changes. stashing them." | |
| git stash | |
| fi | |
| current_branch=`git branch | grep '*' | cut -d ' ' -f2` | |
| echo "update develop from origin" | |
| git pull origin develop:develop |
yeuser
/ merge-repo-as-subdir.sh
Last active
September 10, 2020 13:55
Merging one git repository into another repository
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/bash | |
| if [[ $# -lt 3 ]] ; then | |
| echo "Usage: merge-my-repos <sub_directory> <path_to_repo> <prefix_for_tags>" | |
| exit 1 | |
| fi | |
| DIR=$1 | |
| REPO=$2 | |
| TAG_PREFIX=$3 |