Split a large hunk in a smaller one

710 views
Skip to first unread message

hamen

unread,
Nov 18, 2009, 5:56:34 AM11/18/09
to git-cola
Hi,
I'm using cola 1.3.5.44.ge024. I'm wondering if there is a way to
split a large hunk in a smaller one.
Something like:
$ git add --patch
and its "s" option.
Thanks,
hamen

David Aguilar

unread,
Nov 18, 2009, 2:04:29 PM11/18/09
to hamen, git-cola
Oh, but of course.

git-cola was the first GUI to have that feature. Simply select lines
in the diff view and either use the right-click menu or use the
keyboard shortcut "s" to stage the lines.

A novell feature in git-cola is the ability to reverse-apply aka
"undo" patch snippets in the diff view. That's useful if you make
some changes and later realize that a small handfull of the changes
aren't needed.

Btw that's an old cola. I'd recomend upgrading to the most recent
release; the GUI is much more polished these days.

Have fun,

--
David

hamen

unread,
Nov 19, 2009, 6:21:30 AM11/19/09
to git-cola
On Nov 18, 8:04 pm, David Aguilar <dav...@gmail.com> wrote:
> Btw that's an old cola.  I'd recomend upgrading to the most recent  
> release; the GUI is much more polished these days.

Thank you for the tip. I'm fighting building cola from sources.
My Ubuntu Hardy has a very old package. I hope Qt will finish
compilation some day -_-'
hamen

Iulian Udrea

unread,
Nov 19, 2009, 6:44:10 AM11/19/09
to hamen, git-cola
2009/11/19 hamen <imor...@gmail.com>

If I remember correctly, git-cola is not available in Hardy but Intrepid, Jaunty,
Karmic and Lucid which is currently under development.  Having said that,
I suggest you to upgrade to Karmic.


Cheers!
--
Iulian Udrea
iul...@ubuntu.com

hamen

unread,
Nov 19, 2009, 2:36:09 PM11/19/09
to git-cola
On Nov 19, 12:44 pm, Iulian Udrea <iul...@ubuntu.com> wrote:
> I suggest you to upgrade to Karmic.

I solved my problem compiling PyQt, Qt and Sip from sources
using infos at this link:
http://www.kde-apps.org/content/show.php?action=content&content=83909&PHPSESSID=ca03e058b90

It took some hours, but I can run git-cola 1.4.0.5 now :D
hamen

David Aguilar

unread,
Nov 20, 2009, 1:48:29 PM11/20/09
to hamen, git-cola
I actually just installed Ubuntu on a friend's laptop.
For whatever reason the 9.10 installer kept crashing so we
used the 8.05 LTS release instead. She doesn't need
bleeding edge stuff so the LTS release wasn't a bad fit.

In any case, I played around with it a bit and got git-cola
working with PyQt 4.3 again. It was a good exercise because I
also found differences in git-for-each-ref between git
v1.5.hardy and the current git so I fixed things for git 1.5
compatibility as well.

Anyways, sorry for your troubles compiling stuff.
git-cola did originally support PyQt 4.3 and it was probably
the 1.4.0 release that inadvertingly changed that.

git-cola 1.4.1 will have the PyQt 4.3 fixes if you can wait a
week or two for the official release. Try the latest
out of github until then -- the 4.3 compatibilty fixes have
already been pushed.

The only difference when using 4.3 is that the details in the
"classic" view aren't populated. That's a very minor difference.


Have fun,

--
David

P.S. - yup, both of should consider upgrading to a newer Ubuntu
soon. In any case, cola should work on Hardy now until we have
time to do so.
Reply all
Reply to author
Forward
0 new messages