Hi Khaled,
On Wednesday, 2011-08-31 03:26:30 +0200, Khaled Hosny wrote:
> `git rebase` is your friend:
> http://help.github.com/rebase/
It never occurred to me that rebase has this squash functionality.
I should read more manpages.. thanks a lot!
Just used it on your three joining type patches
Hi all,
thanks for all your tips. I had a look at 'StGit', it seems to help me,
so I will give it a try.
For the workflow with branches, I will start a new build, when I'm back
from 'Hackfest München'.
Kind regards
Regina
___
LibreOffice mailing l
On Wed, Aug 31, 2011 at 03:11:58AM +0200, Eike Rathke wrote:
> Hi Khaled,
>
> On Wednesday, 2011-08-31 02:05:10 +0200, Khaled Hosny wrote:
>
> > > Now the command 'format-patch' has produced two files, one for each
> > > commit. Is there a way, to get _one_ patch file?
> >
> > For the second com
Hi Regina,
On Tue, 2011-08-30 at 23:29 +0200, Regina Henschel wrote:
> Hi all,
>
> I'm still learning to use git and need some help. I have made a patch
> for issue 34431. But after I used the 'commit' command I noticed, that I
> had to change a file, which needs another 'commit'. Now the comma
Hi Khaled,
On Wednesday, 2011-08-31 02:05:10 +0200, Khaled Hosny wrote:
> > Now the command 'format-patch' has produced two files, one for each
> > commit. Is there a way, to get _one_ patch file?
>
> For the second commit use `git commit --ammend`.
That works only on tip though to replace the
Hi Regina,
On Tuesday, 2011-08-30 23:29:09 +0200, Regina Henschel wrote:
> I'm still learning to use git and need some help. I have made a
> patch for issue 34431. But after I used the 'commit' command I
> noticed, that I had to change a file, which needs another 'commit'.
> Now the command 'form
On Tue, Aug 30, 2011 at 11:29:09PM +0200, Regina Henschel wrote:
> Hi all,
>
> I'm still learning to use git and need some help. I have made a
> patch for issue 34431. But after I used the 'commit' command I
> noticed, that I had to change a file, which needs another 'commit'.
> Now the command 'f
Hi Regina,
> I'm still learning to use git and need some help. I have made a patch for
> issue 34431. But after I used the 'commit' command I noticed, that I had to
> change a file, which needs another 'commit'. Now the command 'format-patch'
> has produced two files, one for each commit. Is there
