On Saturday January 24 2015 23:05:10 Jaroslaw Staniek wrote:
> > So always do "git pull --rebase" if you have locally commits added which are
> > not synced yet.
>
> Yep, a small hint: I am using a bash alias gpull for that, maybe it
> will be ok for your taste too:
>
> alias gpull='git pull --r
On 24 January 2015 at 22:56, Friedrich W. H. Kossebau wrote:
> Am Samstag, 24. Januar 2015, 22:42:44 schrieb René J.V. Bertin:
>> On Saturday January 24 2015 19:28:48 Jaroslaw Staniek wrote:
>> > Yep, that was not a big oops. Especially that, René, you're doing a great
>> > work!
>>
>>
>> I think
On 24 January 2015 at 22:42, René J.V. wrote:
> On Saturday January 24 2015 19:28:48 Jaroslaw Staniek wrote:
>
>> Yep, that was not a big oops. Especially that, René, you're doing a great
>> work!
>
>
>
> I think that in the end only the history was messed up a bit, right? I did a
> complete ne
Am Samstag, 24. Januar 2015, 22:42:44 schrieb René J.V. Bertin:
> On Saturday January 24 2015 19:28:48 Jaroslaw Staniek wrote:
> > Yep, that was not a big oops. Especially that, René, you're doing a great
> > work!
>
>
> I think that in the end only the history was messed up a bit, right? I did a
On Saturday January 24 2015 19:28:48 Jaroslaw Staniek wrote:
> Yep, that was not a big oops. Especially that, René, you're doing a great
> work!
I think that in the end only the history was messed up a bit, right? I did a
complete new checkout "the morning after", and found it equal to my wor
On 22 January 2015 at 12:01, Cyrille Berger wrote:
> On 2015-01-21 19:43, Jaroslaw Staniek wrote:
>>
>> Hi,
>> Next time please use rebase to have only single commits.
>> Now ideally we would need the history to be edited by an admin or at
>> least commits repushed exactly as they were...
>
>
> Th
On 2015-01-21 19:43, Jaroslaw Staniek wrote:
Hi,
Next time please use rebase to have only single commits.
Now ideally we would need the history to be edited by an admin or at
least commits repushed exactly as they were...
There isn't too much we can do about it, anyone who has pull has the
cha
On Wednesday January 21 2015 20:51:29 Jaroslaw Staniek wrote:
What's curious is that my working copy seems to have all files with the changes
up to and including commit c052d06a923a849a8bd83f4529b7a52208a7a699 , plus of
course the single point change I intended to commit. I'm talking of the 2.9
Btw, extra recommended from my workflow: use git cherry -v
origin/calligra/2.9 prior to pushing.
On Wednesday, 21 January 2015, René J.V. wrote:
> On Wednesday January 21 2015 19:02:07 Adam Pigg wrote:
>> I wrote myself a reminder
>> https://userbase.kde.org/User:Piggz/CalligraWorkflowInANutshell
I'd vote for editing history or else git blame and bisect becomes rather
broken. ASAP... before too many folks have to do local fix, namely removing
calligra/2.9 local branch or:
http://stackoverflow.com/questions/9813816/git-pull-after-forced-update
On Wednesday, 21 January 2015, René J.V. wrote
On Wednesday January 21 2015 19:02:07 Adam Pigg wrote:
> I wrote myself a reminder
> https://userbase.kde.org/User:Piggz/CalligraWorkflowInANutshell
> maybe it will help
>
> On Wed Jan 21 2015 at 18:51:00 Jaroslaw Staniek wrote:
>
> > Other advices:
> > Use git-new-workdir (explained on this lis
I wrote myself a reminder
https://userbase.kde.org/User:Piggz/CalligraWorkflowInANutshell
maybe it will help
On Wed Jan 21 2015 at 18:51:00 Jaroslaw Staniek wrote:
> Other advices:
> Use git-new-workdir (explained on this list and on the wiki)
> Use git pull -rebase
>
>
> On Wednesday, 21 Januar
Other advices:
Use git-new-workdir (explained on this list and on the wiki)
Use git pull -rebase
On Wednesday, 21 January 2015, René J.V. wrote:
> On Wednesday January 21 2015 18:38:25 Stefano Bonicatti wrote:
>
>> You didn't reverted commits, you had an "old" branch apparently and did a
>> merg
Hi,
Next time please use rebase to have only single commits.
Now ideally we would need the history to be edited by an admin or at least
commits repushed exactly as they were...
On Wednesday, 21 January 2015, René J.V. wrote:
> :-(
>
> Not sure what I did wrong trying to commit a point change in
On Wednesday January 21 2015 18:38:25 Stefano Bonicatti wrote:
> You didn't reverted commits, you had an "old" branch apparently and did a
> merge of your fix instead of a fast-forward (if you look carefully to the
Yes, that I know. For once I followed git's commands because I had already
commit
You didn't reverted commits, you had an "old" branch apparently and did a
merge of your fix instead of a fast-forward (if you look carefully to the
diffs, for instance in kis_opengl.cpp, what it seems you changed it's
actually what commit f888e07e0667ce0ce289db6c2e51fd5a2a99ace2 did).
I think that
:-(
Not sure what I did wrong trying to commit a point change in a single file that
I introduced a regression in, but that commit seems to have reverted a number
of changes:
http://quickgit.kde.org/?p=calligra.git&a=commit&h=2c40d8b87db167dd1d77341daabb2ed7837ee46b
mea culpa, and if I knew how
17 matches
Mail list logo
