Easy. Open branch for each group of changes (for example by jira tickets) and commit them separetly. After finished one fix you can merge that branch back to the master branch.
https://www.atlassian.com/git/tutorials/using-branches " As you read, remember that Git branches aren't like SVN branches. Whereas SVN branches are only used to capture the occasional large-scale development effort, Git branches are an integral part of your everyday workflow." http://git-scm.com/book/be/v2/Git-Branching-Branches-in-a-Nutshell " Because a branch in Git is in actuality a simple file that contains the 40 character SHA-1 checksum of the commit it points to, branches are cheap to create and destroy. Creating a new branch is as quick and simple as writing 41 bytes to a file (40 characters and a newline). This is in sharp contrast to the way most older VCS tools branch, which involves copying all of the project's files into a second directory. This can take several seconds or even minutes, depending on the size of the project, whereas in Git the process is always instantaneous. Also, because we're recording the parents when we commit, finding a proper merge base for merging is automatically done for us and is generally very easy to do. These features help encourage developers to create and use branches often. " OMACHT ANDRÁS fejlesztési igazgató Libra Szoftver Zrt. 1113 Budapest, Karolina út 65. Tel.: +36 1 255 3939 Fax: +36 1 209 1477 http://www.libraszoftver.hu -----Original Message----- From: Dmitry Yemanov [mailto:firebi...@yandex.ru] Sent: Tuesday, March 10, 2015 1:43 PM To: For discussion among Firebird Developers Subject: Re: [Firebird-devel] Commits visible in our main page. 10.03.2015 15:30, Michal Kubecek wrote: > However, there is seldom need for multiple working directories. Right now I have five working directories for the same B2_5_Release branch, each with different uncommitted changes. I don't see how it can be avoided. Dmitry ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
