Mixing
Rebase private history moving bunch of changes where they logically belong to
Quite often, I make a bunch of commits and review the files later, but before pushing them. This usually leads to a bunch of minor changes like reduced visibility, improved naming, etc. Such changes usually can and should be included into the last commit changing the corresponding file, assuming this commit haven't yet been pushed.
I wonder, if there's an easy way to automate this process, i.e.,
- for each dirty file, find the last commit modifying it
- if this commit lies in a range (e.g.,
master..origin/master) - then amend this commit with this change
git rebase
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
add a comment |
Quite often, I make a bunch of commits and review the files later, but before pushing them. This usually leads to a bunch of minor changes like reduced visibility, improved naming, etc. Such changes usually can and should be included into the last commit changing the corresponding file, assuming this commit haven't yet been pushed.
I wonder, if there's an easy way to automate this process, i.e.,
- for each dirty file, find the last commit modifying it
- if this commit lies in a range (e.g.,
master..origin/master) - then amend this commit with this change
git rebase
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
1
Sounds like recently promotedhg absorb. Quick googling shows there is at least one git port, but I have not tried it
– max630
Jan 3 at 21:56
@max630 My idea was actually simpler, buthg absorbsounds much smarter. I haven't tried thegitport yet either, but I will when I get some spare time.
– maaartinus
Jan 6 at 1:35
add a comment |
Quite often, I make a bunch of commits and review the files later, but before pushing them. This usually leads to a bunch of minor changes like reduced visibility, improved naming, etc. Such changes usually can and should be included into the last commit changing the corresponding file, assuming this commit haven't yet been pushed.
I wonder, if there's an easy way to automate this process, i.e.,
- for each dirty file, find the last commit modifying it
- if this commit lies in a range (e.g.,
master..origin/master) - then amend this commit with this change
git rebase
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
Quite often, I make a bunch of commits and review the files later, but before pushing them. This usually leads to a bunch of minor changes like reduced visibility, improved naming, etc. Such changes usually can and should be included into the last commit changing the corresponding file, assuming this commit haven't yet been pushed.
I wonder, if there's an easy way to automate this process, i.e.,
- for each dirty file, find the last commit modifying it
- if this commit lies in a range (e.g.,
master..origin/master) - then amend this commit with this change
git rebase
git rebase
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
edited Jan 2 at 20:49
maaartinus
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
asked Jan 2 at 20:18
maaartinusmaaartinus
27.3k2195238
27.3k2195238
1
Sounds like recently promotedhg absorb. Quick googling shows there is at least one git port, but I have not tried it
– max630
Jan 3 at 21:56
@max630 My idea was actually simpler, buthg absorbsounds much smarter. I haven't tried thegitport yet either, but I will when I get some spare time.
– maaartinus
Jan 6 at 1:35
add a comment |
1
Sounds like recently promotedhg absorb. Quick googling shows there is at least one git port, but I have not tried it
– max630
Jan 3 at 21:56
@max630 My idea was actually simpler, buthg absorbsounds much smarter. I haven't tried thegitport yet either, but I will when I get some spare time.
– maaartinus
Jan 6 at 1:35
1
1
Sounds like recently promoted
hg absorb. Quick googling shows there is at least one git port, but I have not tried it– max630
Jan 3 at 21:56
Sounds like recently promoted
hg absorb. Quick googling shows there is at least one git port, but I have not tried it– max630
Jan 3 at 21:56
@max630 My idea was actually simpler, but
hg absorb sounds much smarter. I haven't tried the git port yet either, but I will when I get some spare time.– maaartinus
Jan 6 at 1:35
@max630 My idea was actually simpler, but
hg absorb sounds much smarter. I haven't tried the git port yet either, but I will when I get some spare time.– maaartinus
Jan 6 at 1:35
add a comment |
0
active
oldest
votes
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%2f54012624%2frebase-private-history-moving-bunch-of-changes-where-they-logically-belong-to%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
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.
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%2f54012624%2frebase-private-history-moving-bunch-of-changes-where-they-logically-belong-to%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
1
Sounds like recently promoted
hg absorb. Quick googling shows there is at least one git port, but I have not tried it– max630
Jan 3 at 21:56
@max630 My idea was actually simpler, but
hg absorbsounds much smarter. I haven't tried thegitport yet either, but I will when I get some spare time.– maaartinus
Jan 6 at 1:35