Skip to content

Commit

Permalink
Merge pull request #2 from hraban/master
Browse files Browse the repository at this point in the history
Set to master and checkout working dir after run
  • Loading branch information
hraban committed Feb 15, 2016
2 parents 74af8f8 + d13c453 commit e627b39
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tomono.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ function create-mono {
git fetch -qa "$name"
# Merge every branch from the sub repo into the mono repo, into a
# branch of the same name (create one if it doesn't exist).
# Silly git branch outputs a * in front of the current branch name..
remote-branches "$name" | while read branch; do
if git rev-parse -q --verify "$branch"; then
# Branch already exists, just check it out (and clean up the working dir)
Expand All @@ -80,6 +79,8 @@ function create-mono {
git commit -q --no-verify --allow-empty -m "Merging $name to $branch"
done
done
git checkout -q master
git checkout -q .
}

if [[ "$is_script" == "true" ]]; then
Expand Down

0 comments on commit e627b39

Please sign in to comment.