How to break a series of git commits into patches for submission to another project

Posted by krosenvold on Stack Overflow See other posts from Stack Overflow or by krosenvold
Published on 2010-06-08T18:55:35Z Indexed on 2010/06/09 12:02 UTC
Read the original article Hit count: 276

Filed under:

git

|

Patches

So I've been bashing away at my favorite open source project for quite some time, and It's time for submitting issues with patches back. I have to regroup my commits more or less fully, and hopefully extract some pieces of code that can function as distinct patches to avoid code bombing. Currently I usually do something like this:

rebase/squash everything to one commit since the old ones often don't make sense as patches
undo that commit
start adding stuff that I think fits to one commit, using add/add -i
commit
stash the rest
test that commit
re-apply the stash and start from 3 until all is accounted for

It works, but is there a better way ?

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about Patches

Oracle ??????????? -2012?4??: Composite Patches

as seen on Oracle Blogs - Search for 'Oracle Blogs'
???????DBA?????????????bundle patches, ??Patch Set Updates(PSU)????????,??oracle??????bundle patches,??PSU,??,??????????????,???????????????????(one-off patch),????overlay patches,??????????????? Oracle?????????,???2012?4???Database PSU 11.2.0.3.2??,??????patch??Composite Patches… >>> More
Why does Akonadi on KDE 4.6.0 refuse to start?

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
Akonadi refuses to start on my fresh installation of KDE 4.6.0 from the kubuntu-backports PPA on Ubuntu 10.10 Maverick Meerkat, preventing me from usking KMail. Here is the full error output: patches@pleistocene:~/.local/share$ akonadictl start Starting Akonadi Server... done. patches@pleistocene:~/… >>> More
Some VS 2010 RC Updates (including patches for Intellisense and Web Designer fixes)

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
[In addition to blogging, I am also now using Twitter for quick updates and to share links. Follow me at: twitter.com/scottgu] We are continuing to make progress on shipping Visual Studio 2010. I’d like to say a big thank you to everyone who has downloaded and tried out the VS 2010 Release… >>> More
Some VS 2010 RC Updates (including patches for Intellisense and Web Designer fixes)

as seen on Dot net Slackers - Search for 'Dot net Slackers'
[In addition to blogging, I am also now using Twitter for quick updates and to share links. Follow me at: twitter.com/scottgu] We are continuing to make progress on shipping Visual Studio 2010. Id like to say a big thank you to everyone who has downloaded and tried out the VS 2010 Release… >>> More
Some VS 2010 RC Updates (including patches for Intellisense and Web Designer fixes)

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
[In addition to blogging, I am also now using Twitter for quick updates and to share links. Follow me at: twitter.com/scottgu ] We are continuing to make progress on shipping Visual Studio 2010. I’d like to say a big thank you to everyone who has Read More......(read more) >>> More