Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mysterious alias: git up #515

Closed
jessieay opened this issue Mar 10, 2017 · 6 comments
Closed

Mysterious alias: git up #515

jessieay opened this issue Mar 10, 2017 · 6 comments

Comments

@jessieay
Copy link
Contributor

Hola --

I run git up about a zillion times a day. It fetches updates from master and rebases my current branch on top of those.

I always thought this alias came from the thoughtbot dotfiles...but now I cannot find it in here anywhere. This morning I updated my local dotfiles to contain the latest master from this repo, but I still have git up available and I do not see it when running git config --global --list

Does anyone know where this alias might be coming from? I am stumped!

@gylaz
Copy link
Contributor

gylaz commented Mar 10, 2017

A lot of git aliases have been moved to binaries: https://github.com/thoughtbot/dotfiles/tree/master/bin

@geoffharcourt
Copy link
Collaborator

Hi @jessieay!

It's not an alias, it's a git command, git-up.

@jessieay
Copy link
Contributor Author

jessieay commented Mar 10, 2017

ooooh! so it is. Thank you for solving this mystery.

Now a related question: would there be an easy way to make this command know what my base branch is? Increasingly, I am working off of a base branch of develop which auto-deploys to staging when it passes CI. master auto-deploys to prod so we merge develop into master regularly.

This is not true for all of my projects so I wouldn't want to update the command to always assume a base branch of develop....but it would be nice if it were smart enough to rebase off of origin/develop rather than master on some repos...

@gylaz
Copy link
Contributor

gylaz commented Mar 10, 2017

What I've done in the past is copy git-up into my project's bin/ (if you're sell is setup to prioritize that) and updated the script to point to origin/develop.

@croaky
Copy link
Contributor

croaky commented Mar 10, 2017

Hiiii @jessieay

@jessieay
Copy link
Contributor Author

👋 👋 👋 👋 👋 👋

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants