How do I git rebase from master in fewer commands when I have local file changes
If I am working on a feature branch, and I want to fetch and rebase in changes from the master branch, is there a shorter way to do it than this?
git stash
git checkout master
git pull
git checkout my-feature-branch
git rebase master
git stash pop
Note how I have to stash too, because I have edited a config file that I don't want to commit.
How can I do this in fewer commands?
git rebase
asked Nov 22 at 18:57
aherriot
1,47941428
add a comment |
If I am working on a feature branch, and I want to fetch and rebase in changes from the master branch, is there a shorter way to do it than this?
git stash
git checkout master
git pull
git checkout my-feature-branch
git rebase master
git stash pop
Note how I have to stash too, because I have edited a config file that I don't want to commit.
How can I do this in fewer commands?
git rebase
asked Nov 22 at 18:57
aherriot
1,47941428
I think you don't needgit checkout masterand then `git checkout my-feature-branch', just pull and rebase
– Alexan
Nov 22 at 19:12
add a comment |
If I am working on a feature branch, and I want to fetch and rebase in changes from the master branch, is there a shorter way to do it than this?
git stash
git checkout master
git pull
git checkout my-feature-branch
git rebase master
git stash pop
Note how I have to stash too, because I have edited a config file that I don't want to commit.
How can I do this in fewer commands?
git rebase
asked Nov 22 at 18:57
aherriot
1,47941428
If I am working on a feature branch, and I want to fetch and rebase in changes from the master branch, is there a shorter way to do it than this?
git stash
git checkout master
git pull
git checkout my-feature-branch
git rebase master
git stash pop
Note how I have to stash too, because I have edited a config file that I don't want to commit.
How can I do this in fewer commands?
git rebase
git rebase
asked Nov 22 at 18:57
aherriot
1,47941428
asked Nov 22 at 18:57
aherriot
1,47941428
asked Nov 22 at 18:57
aherriot
1,47941428
asked Nov 22 at 18:57
aherriot
1,47941428
asked Nov 22 at 18:57
aherriot
1,47941428
1,47941428
I think you don't needgit checkout masterand then `git checkout my-feature-branch', just pull and rebase
– Alexan
Nov 22 at 19:12
add a comment |
I think you don't needgit checkout masterand then `git checkout my-feature-branch', just pull and rebase
– Alexan
Nov 22 at 19:12
I think you don't need
git checkout master and then `git checkout my-feature-branch', just pull and rebase– Alexan
Nov 22 at 19:12
I think you don't need
git checkout master and then `git checkout my-feature-branch', just pull and rebase– Alexan
Nov 22 at 19:12
add a comment |
2 Answers
2
active
oldest
votes
One line version:
git pull --rebase --autostash origin master
answered Nov 22 at 19:43
Alexan
4,25374874
git pull doesn't pull all the branches by default.
– aherriot
Nov 22 at 19:56
@aherriot, corrected
– Alexan
Nov 22 at 20:11
add a comment |
Perhaps you can write a script for this.
I think against git rebase master is better git merge master --no-ff
If you use gitflow, there are some maven plugin to make a feature branch
or finish feature branch etc. But the feature branch is from develop branch not from master.
answered Nov 22 at 19:15
László Tóth
765
add a comment |
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53436770%2fhow-do-i-git-rebase-from-master-in-fewer-commands-when-i-have-local-file-changes%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
2 Answers
2
active
oldest
votes
2 Answers
2
active
oldest
votes
active
oldest
votes
active
oldest
votes
One line version:
git pull --rebase --autostash origin master
answered Nov 22 at 19:43
Alexan
4,25374874
git pull doesn't pull all the branches by default.
– aherriot
Nov 22 at 19:56
@aherriot, corrected
– Alexan
Nov 22 at 20:11
add a comment |
One line version:
git pull --rebase --autostash origin master
answered Nov 22 at 19:43
Alexan
4,25374874
git pull doesn't pull all the branches by default.
– aherriot
Nov 22 at 19:56
@aherriot, corrected
– Alexan
Nov 22 at 20:11
add a comment |
One line version:
git pull --rebase --autostash origin master
answered Nov 22 at 19:43
Alexan
4,25374874
One line version:
git pull --rebase --autostash origin master
answered Nov 22 at 19:43
Alexan
4,25374874
edited Nov 23 at 4:27
answered Nov 22 at 19:43
Alexan
4,25374874
answered Nov 22 at 19:43
Alexan
4,25374874
answered Nov 22 at 19:43
Alexan
4,25374874
4,25374874
git pull doesn't pull all the branches by default.
– aherriot
Nov 22 at 19:56
@aherriot, corrected
– Alexan
Nov 22 at 20:11
add a comment |
git pull doesn't pull all the branches by default.
– aherriot
Nov 22 at 19:56
@aherriot, corrected
– Alexan
Nov 22 at 20:11
git pull doesn't pull all the branches by default.
– aherriot
Nov 22 at 19:56
git pull doesn't pull all the branches by default.
– aherriot
Nov 22 at 19:56
@aherriot, corrected
– Alexan
Nov 22 at 20:11
@aherriot, corrected
– Alexan
Nov 22 at 20:11
add a comment |
Perhaps you can write a script for this.
I think against git rebase master is better git merge master --no-ff
If you use gitflow, there are some maven plugin to make a feature branch
or finish feature branch etc. But the feature branch is from develop branch not from master.
answered Nov 22 at 19:15
László Tóth
765
add a comment |
Perhaps you can write a script for this.
I think against git rebase master is better git merge master --no-ff
If you use gitflow, there are some maven plugin to make a feature branch
or finish feature branch etc. But the feature branch is from develop branch not from master.
answered Nov 22 at 19:15
László Tóth
765
add a comment |
Perhaps you can write a script for this.
I think against git rebase master is better git merge master --no-ff
If you use gitflow, there are some maven plugin to make a feature branch
or finish feature branch etc. But the feature branch is from develop branch not from master.
answered Nov 22 at 19:15
László Tóth
765
Perhaps you can write a script for this.
I think against git rebase master is better git merge master --no-ff
If you use gitflow, there are some maven plugin to make a feature branch
or finish feature branch etc. But the feature branch is from develop branch not from master.
answered Nov 22 at 19:15
László Tóth
765
answered Nov 22 at 19:15
László Tóth
765
answered Nov 22 at 19:15
László Tóth
765
answered Nov 22 at 19:15
László Tóth
765
765
add a comment |
add a comment |
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Some of your past answers have not been well-received, and you're in danger of being blocked from answering.
Please pay close attention to the following guidance:
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53436770%2fhow-do-i-git-rebase-from-master-in-fewer-commands-when-i-have-local-file-changes%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
I think you don't need
git checkout masterand then `git checkout my-feature-branch', just pull and rebase– Alexan
Nov 22 at 19:12