Fixup changes in patches using fixup

-
While your changes are in the local repository you can  make commit one on top of another and then merge them using git rebase

git rebase --interactive HEAD~2

 But once pushed we want to ammend the previous commit using fixups using

git commit --fixup commitID

git rebase -i --autosquash master

Comments

Post a Comment

Popular posts from this blog

Debugging LibreOffice with GDB

-
Getting started To debug LibreOffice with GDB you need to build LibreOffice with debug symbols. You can either choose to build LO with symbols for the entire project or for selected modules. For building with symbols for the entire project you can use ./autogen.sh --enable-debug For building  with symbols for specific modules ./autogen.sh --enable-debug --enable-selective-debuginfo = "sc/"   More information for setting up GDB can be found here How to debug . Setting up pretty printers Basics Debugging boils down to the following set of actions: Set up a break point Run the program Step through the code Analyze the variables as you go Handling Crashes while debugging The most common reasons for crashes are either an exception occurred or an assertion failures. In case of Exceptions, you can stop GDB at the point where the exception occurred by setting up a breakpoint using catch throw and then analyze the backtrace (generated using bt )....
Read more

GSoC Summary

-
Working with Lireoffice during GSoC has been a great learning experience. It has helped me get better at C++ and taught me how real world applications are built. I also spent most of my time at the debugger rather than writing code which has helped me improve my debugging skills. It also taught me what a great tool git is for managing commits and has been helpful in more than one occasion.  My mentors, and the Libreoffice community has been very helpful and have guided me whenever I got stuck. It feels good to be a part of such a great community. Below is a list of tasks that was done as part of the GSoC project and also a list of tasks that I wanted to, but could not finish during the period. Work Done Added Data Transformations https://gerrit.libreoffice.org/#/c/58152/   https://gerrit.libreoffice.org/#/c/58151/   https://gerrit.libreoffice.org/#/c/56886/   https://gerrit.libreoffice.org/#/c/56862/   https://gerrit.libreoffice.org/#/c/567...
Read more