Mixing
git rebase and squash the commit with a message
Is it possible when we resolve some git conflict via git rebase to squash that rebase via simple message for example "resolve conflicts".
This is my commit history after resolving a specific conflict:
As you see the last 3 commits represent a git rebase then git push -f. I think it's more logical to set just one commit with a message instead of having 3 (the number of commits on the current branch) commits
git
edited Nov 19 '18 at 12:56
Saty Anand
409111
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
add a comment |
Is it possible when we resolve some git conflict via git rebase to squash that rebase via simple message for example "resolve conflicts".
This is my commit history after resolving a specific conflict:
As you see the last 3 commits represent a git rebase then git push -f. I think it's more logical to set just one commit with a message instead of having 3 (the number of commits on the current branch) commits
git
edited Nov 19 '18 at 12:56
Saty Anand
409111
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
1
If I didn't misunderstood your question, what you want is git fixup.
– Saty Anand
Nov 19 '18 at 12:58
I think so, thank you for your reply, could you explain to me the fixup command, and is it recommanded in my case ? What do you think when I should use it?
– Ahmed bhs
Nov 19 '18 at 13:01
add a comment |
Is it possible when we resolve some git conflict via git rebase to squash that rebase via simple message for example "resolve conflicts".
This is my commit history after resolving a specific conflict:
As you see the last 3 commits represent a git rebase then git push -f. I think it's more logical to set just one commit with a message instead of having 3 (the number of commits on the current branch) commits
git
edited Nov 19 '18 at 12:56
Saty Anand
409111
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
Is it possible when we resolve some git conflict via git rebase to squash that rebase via simple message for example "resolve conflicts".
This is my commit history after resolving a specific conflict:
As you see the last 3 commits represent a git rebase then git push -f. I think it's more logical to set just one commit with a message instead of having 3 (the number of commits on the current branch) commits
git
git
edited Nov 19 '18 at 12:56
Saty Anand
409111
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
edited Nov 19 '18 at 12:56
Saty Anand
409111
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
edited Nov 19 '18 at 12:56
Saty Anand
409111
edited Nov 19 '18 at 12:56
Saty Anand
409111
edited Nov 19 '18 at 12:56
Saty Anand
409111
409111
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
asked Nov 19 '18 at 12:51
Ahmed bhs
691421
691421
1
If I didn't misunderstood your question, what you want is git fixup.
– Saty Anand
Nov 19 '18 at 12:58
I think so, thank you for your reply, could you explain to me the fixup command, and is it recommanded in my case ? What do you think when I should use it?
– Ahmed bhs
Nov 19 '18 at 13:01
add a comment |
1
If I didn't misunderstood your question, what you want is git fixup.
– Saty Anand
Nov 19 '18 at 12:58
I think so, thank you for your reply, could you explain to me the fixup command, and is it recommanded in my case ? What do you think when I should use it?
– Ahmed bhs
Nov 19 '18 at 13:01
1
1
If I didn't misunderstood your question, what you want is git fixup.
– Saty Anand
Nov 19 '18 at 12:58
If I didn't misunderstood your question, what you want is git fixup.
– Saty Anand
Nov 19 '18 at 12:58
I think so, thank you for your reply, could you explain to me the fixup command, and is it recommanded in my case ? What do you think when I should use it?
– Ahmed bhs
Nov 19 '18 at 13:01
I think so, thank you for your reply, could you explain to me the fixup command, and is it recommanded in my case ? What do you think when I should use it?
– Ahmed bhs
Nov 19 '18 at 13:01
add a comment |
1 Answer
1
active
oldest
votes
I would recommend doing an interactive rebase, picking the commits you want and the ones you want to squash you prefix with squash instead of pick.
For example in your case it would look something like this (the number is how many commits after HEAD you would like to rebase):
git rebase -i HEAD~3
You will then get a prompt with the commits and their message which will look something like this:
pick <HASHID> Initial Commit
pick <HASHID> Login via mail instead of username
pick <HASHID> Add missing files
Just change the pick to squash (And keep one as the pick commit).
You will then be able to rewrite that commit message and voila you have 1 commit which you do git push -f if you would like.
answered Nov 19 '18 at 13:06
Englund
849612
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%2f53375039%2fgit-rebase-and-squash-the-commit-with-a-message%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
I would recommend doing an interactive rebase, picking the commits you want and the ones you want to squash you prefix with squash instead of pick.
For example in your case it would look something like this (the number is how many commits after HEAD you would like to rebase):
git rebase -i HEAD~3
You will then get a prompt with the commits and their message which will look something like this:
pick <HASHID> Initial Commit
pick <HASHID> Login via mail instead of username
pick <HASHID> Add missing files
Just change the pick to squash (And keep one as the pick commit).
You will then be able to rewrite that commit message and voila you have 1 commit which you do git push -f if you would like.
answered Nov 19 '18 at 13:06
Englund
849612
add a comment |
I would recommend doing an interactive rebase, picking the commits you want and the ones you want to squash you prefix with squash instead of pick.
For example in your case it would look something like this (the number is how many commits after HEAD you would like to rebase):
git rebase -i HEAD~3
You will then get a prompt with the commits and their message which will look something like this:
pick <HASHID> Initial Commit
pick <HASHID> Login via mail instead of username
pick <HASHID> Add missing files
Just change the pick to squash (And keep one as the pick commit).
You will then be able to rewrite that commit message and voila you have 1 commit which you do git push -f if you would like.
answered Nov 19 '18 at 13:06
Englund
849612
add a comment |
I would recommend doing an interactive rebase, picking the commits you want and the ones you want to squash you prefix with squash instead of pick.
For example in your case it would look something like this (the number is how many commits after HEAD you would like to rebase):
git rebase -i HEAD~3
You will then get a prompt with the commits and their message which will look something like this:
pick <HASHID> Initial Commit
pick <HASHID> Login via mail instead of username
pick <HASHID> Add missing files
Just change the pick to squash (And keep one as the pick commit).
You will then be able to rewrite that commit message and voila you have 1 commit which you do git push -f if you would like.
answered Nov 19 '18 at 13:06
Englund
849612
I would recommend doing an interactive rebase, picking the commits you want and the ones you want to squash you prefix with squash instead of pick.
For example in your case it would look something like this (the number is how many commits after HEAD you would like to rebase):
git rebase -i HEAD~3
You will then get a prompt with the commits and their message which will look something like this:
pick <HASHID> Initial Commit
pick <HASHID> Login via mail instead of username
pick <HASHID> Add missing files
Just change the pick to squash (And keep one as the pick commit).
You will then be able to rewrite that commit message and voila you have 1 commit which you do git push -f if you would like.
answered Nov 19 '18 at 13:06
Englund
849612
answered Nov 19 '18 at 13:06
Englund
849612
answered Nov 19 '18 at 13:06
Englund
849612
answered Nov 19 '18 at 13:06
Englund
849612
849612
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%2f53375039%2fgit-rebase-and-squash-the-commit-with-a-message%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
If I didn't misunderstood your question, what you want is git fixup.
– Saty Anand
Nov 19 '18 at 12:58
I think so, thank you for your reply, could you explain to me the fixup command, and is it recommanded in my case ? What do you think when I should use it?
– Ahmed bhs
Nov 19 '18 at 13:01