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.

Sign up for GitHub

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

Jump to bottom

have "git pullall" alias auto-detect a shared branch and merge instead of rebasing #2192

Closed
derekbruening opened this issue Feb 15, 2017 · 1 comment
Closed

have "git pullall" alias auto-detect a shared branch and merge instead of rebasing #2192

derekbruening opened this issue Feb 15, 2017 · 1 comment
Labels
Component-Tools help wanted

Comments

@derekbruening
Copy link
Contributor

For our new workflow, on a feature branch we want to merge rather than rebase if it's been posted for review. We'd like "git pullall" to automagically do this for us.
@derekbruening
Copy link
Contributor Author

derekbruening commented Feb 20, 2017 •
edited
Loading

We have a 3rd use case as well: if a feature branch has been updated from master using Github's UI button, and we want to update the local feature branch, we want to pull from the remote feature branch, not master, and we want to rebase, not merge:

git pull origin iXXXX-myfeature

derekbruening added a commit that referenced this issue Feb 26, 2017
@derekbruening
i#2192: add pullall and review scripts
af5ad93 
Expands the pullall and review commands into scripts that give us these
features:

+ pullall pulls from both the upstream master and upstream feature branch,
  if it exists.

+ review checks for the branch name matching our conventions.

Fixes #2192
@derekbruening derekbruening mentioned this issue Feb 26, 2017
Merged
derekbruening added a commit that referenced this issue Feb 26, 2017
@derekbruening
I2192 pullall and review scripts (#2230)
a4154ef 
Expands the pullall and review commands into scripts that give us these
features:

+ pullall pulls from both the upstream master and upstream feature branch,
  if it exists, using the appropriate rebase or merge in each case.

+ review checks for the branch name matching our conventions.

Fixes #2192
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Component-Tools help wanted
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@derekbruening