git rebase -i [commit version]
e.g., git rebase -i 343413bd0c7fce7f6c9dd4dab14964fb9a9a885f
I use this command to clean up my repository and remove some redundant commits.
For example,
343413bd0c7fce7f6c9dd4dab14964fb9a9a885f is the basis version I use.
After this version, I have two more versions which are required to be revised or squashed.
A editor will emerge and ask my intention:
pick e423a6e blablabla
pick 59c8f7a blablabla
Normally, it shows "pick" for directly using the commit.
To edit or squash, just change "pick" to "edit", "squash", or "fixup".
After that, like describing in the original manual:
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
More detail usage:
http://stackoverflow.com/questions/37219/how-do-you-remove-a-specific-revision-in-the-git-history
git format-patch, which is used to create git patches. The number is the number of latest versions which are patched.
e.g. git format-patch -3
If you want to specify the version of the patch is v2 or v3, just add -v2 or v3.
git am, which is used to apply git patch to the current branch.
e.g., git am *.patch
git send-email, which is used to send a collection of patches as mails.
e.g.: git send-email --to devel@rtems.org *.patch
(Please note that this command requires the support from the host operating system.)
I use Ubuntu 14.04 LTS and gmail as the target smtp server. I have followed the following tutorial to configure my mailing system:
http://www.havetheknowhow.com/Configure-the-server/Install-ssmtp.html
To the end, git send-email command works.
e.g., git rebase -i 343413bd0c7fce7f6c9dd4dab14964fb9a9a885f
I use this command to clean up my repository and remove some redundant commits.
For example,
343413bd0c7fce7f6c9dd4dab14964fb9a9a885f is the basis version I use.
After this version, I have two more versions which are required to be revised or squashed.
A editor will emerge and ask my intention:
pick e423a6e blablabla
pick 59c8f7a blablabla
Normally, it shows "pick" for directly using the commit.
To edit or squash, just change "pick" to "edit", "squash", or "fixup".
After that, like describing in the original manual:
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
More detail usage:
http://stackoverflow.com/questions/37219/how-do-you-remove-a-specific-revision-in-the-git-history
git format-patch, which is used to create git patches. The number is the number of latest versions which are patched.
e.g. git format-patch -3
If you want to specify the version of the patch is v2 or v3, just add -v2 or v3.
git am, which is used to apply git patch to the current branch.
e.g., git am *.patch
git send-email, which is used to send a collection of patches as mails.
e.g.: git send-email --to devel@rtems.org *.patch
(Please note that this command requires the support from the host operating system.)
I use Ubuntu 14.04 LTS and gmail as the target smtp server. I have followed the following tutorial to configure my mailing system:
http://www.havetheknowhow.com/Configure-the-server/Install-ssmtp.html
To the end, git send-email command works.
Comments
Post a Comment