On 2/13/07, Ramagudi Naziir <naziirr@xxxxxxxxx> wrote:
Hello, On 1/17/07, Erik Mouw <mouw@xxxxxxxxxxxx> wrote: > On Wed, Jan 17, 2007 at 11:13:21AM +0200, Ramagudi Naziir wrote: > > Is there a way to unroll a commit ? > > Yes, git-revert. I am a little puzzled here. I pulled a new tree. I did some work. I committed my file. I did some more work, on the same file. I want to create a single diff with everything, so I want to revert my first commit and do a new one that will reflect everything i did. How do I do this ?
This type of work I find is done easiest using Stacked GIT (stGIT). you do: % stg init % stg new my_first_patch ... make changes % stg refresh ---> Refreshes your patch % stg show <patchname> --> shows your changes % stg new my_second_patch ... make changes % stg refresh --> refreshes your second patch, _stacked_ on top of the first, hence the name stacked git. then export your patches by: % stg export -np -r my_first_patch..my_second_patch make sure to have GIT_COMMITTERS_NAME GIT_AUTHOR_NAME GIT_AUTHOR EMAIL set properly. Bahadir -- To unsubscribe from this list: send an email with "unsubscribe kernelnewbies" to ecartis@xxxxxxxxxxxx Please read the FAQ at http://kernelnewbies.org/FAQ
