Git gui

[Burt Beckwith]

Some parts of this message have been removed. Learn more about Nabble's security policy.

What are you guys using as a Git gui tool? Does IntelliJ have good support or is there some external tool that people are using? I'm looking for something that can give me a tree of files that are modified/added/deleted remotely and/or locally and that allows a per-file diff from that view - basically a wrapper for 'git log'. I know I can just run 'git pull' to update but I prefer to see what's changed before updating.

Is there anything like that available? Eclipse has this for its various SCM tools but it doesn't have Git support yet.

Burt

[Richard Vowles]

Is there something wrong with EGit?

http://git.or.cz/gitwiki/EclipsePlugin

One of the features of JGit (underlying EGit) I like is the ability to use S3 as a repo....

IDEA has very good support for Git, but it does pick up stuff that is outside of your current project and doesn't make it easy to select what to add (no "sort by directory" for example).

Richard

On Wed, Jun 24, 2009 at 11:28 AM, Burt Beckwith <burt@...> wrote:

What are you guys using as a Git gui tool? Does IntelliJ have good support or is there some external tool that people are using? I'm looking for something that can give me a tree of files that are modified/added/deleted remotely and/or locally and that allows a per-file diff from that view - basically a wrapper for 'git log'. I know I can just run 'git pull' to update but I prefer to see what's changed before updating.

Is there anything like that available? Eclipse has this for its various SCM tools but it doesn't have Git support yet.

Burt

--
---
Richard Vowles,
Talk to me about development in Grails, Groovy, Java and for the Blackberry
ph: [phone], linkedin, skype:rvowles
get 2Gb shared disk space in the cloud - Dropbox, its incredibly useful! - http://tinyurl.com/cmcceh
podcast: http://www.illegalargument.com

[Burt Beckwith]

Some parts of this message have been removed. Learn more about Nabble's security policy.

Yes, EGit isn't there :) The update site returns an error. Apparently the project has been donated to Eclipse but is in a very early stage. I suppose I should use this as an excuse to build a Griffon app based on JGit.

Burt

On Tuesday 23 June 2009 7:59:30 pm Richard Vowles wrote:
> Is there something wrong with EGit?
>
> http://git.or.cz/gitwiki/EclipsePlugin
>
> One of the features of JGit (underlying EGit) I like is the ability to use
> S3 as a repo....
>
> IDEA has very good support for Git, but it does pick up stuff that is
> outside of your current project and doesn't make it easy to select what to
> add (no "sort by directory" for example).
>
> Richard
>
> On Wed, Jun 24, 2009 at 11:28 AM, Burt Beckwith <burt@...>wrote:
>
> > What are you guys using as a Git gui tool? Does IntelliJ have good support
> > or is there some external tool that people are using? I'm looking for
> > something that can give me a tree of files that are modified/added/deleted
> > remotely and/or locally and that allows a per-file diff from that view -
> > basically a wrapper for 'git log'. I know I can just run 'git pull' to
> > update but I prefer to see what's changed before updating.
> >
> >
> > Is there anything like that available? Eclipse has this for its various SCM
> > tools but it doesn't have Git support yet.
> >
> >
> > Burt

[Richard Vowles]

Seems to be being updated? (7 hours ago?)

http://repo.or.cz/w/egit.git

I understood JGit was under active development, but didn't know anything about EGit.

On Wed, Jun 24, 2009 at 12:08 PM, Burt Beckwith <burt@...> wrote:

Yes, EGit isn't there :) The update site returns an error. Apparently the project has been donated to Eclipse but is in a very early stage. I suppose I should use this as an excuse to build a Griffon app based on JGit.

--
---
Richard Vowles,
Talk to me about development in Grails, Groovy, Java and for the Blackberry
ph: [phone], linkedin, skype:rvowles
get 2Gb shared disk space in the cloud - Dropbox, its incredibly useful! - http://tinyurl.com/cmcceh
podcast: http://www.illegalargument.com

[Graeme Rocher-3]

I use a combination of Intellij (which is good), TextMate Git bundle and Gitx

Cheers

On Wed, Jun 24, 2009 at 12:28 AM, Burt Beckwith<burt@...> wrote:

> What are you guys using as a Git gui tool? Does IntelliJ have good support
> or is there some external tool that people are using? I'm looking for
> something that can give me a tree of files that are modified/added/deleted
> remotely and/or locally and that allows a per-file diff from that view -
> basically a wrapper for 'git log'. I know I can just run 'git pull' to
> update but I prefer to see what's changed before updating.
>
> Is there anything like that available? Eclipse has this for its various SCM
> tools but it doesn't have Git support yet.
>
> Burt
>
>

--
Graeme Rocher
Head of Grails Development
SpringSource - Weapons for the War on Java Complexity
http://www.springsource.com

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

    http://xircles.codehaus.org/manage_email

[Marcus Better]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Burt Beckwith wrote:
> basically a wrapper for 'git log'. I know I can just run 'git pull' to
> update but I prefer to see what's changed before updating.

git fetch
git diff HEAD..origin/master
# hmm, looks okay, now let's update
git pull

Cheers,

Marcus

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkpB2qwACgkQXjXn6TzcAQkt9gCg5XyFXEo4HmZLe7051isBNLKA
SWQAn25QrqUEsJ58hs5FczyBJAGp0vZg
=liE/
-----END PGP SIGNATURE-----



---------------------------------------------------------------------
To unsubscribe from this list, please visit:

    http://xircles.codehaus.org/manage_email

[Dmitriy Kopylenko-3]

Or after you've done the fetch, you could simply do 'git merge origin/master'

Cheers,
Dmitriy.

2009/6/24 Marcus Better <marcus@...>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Burt Beckwith wrote:
> basically a wrapper for 'git log'. I know I can just run 'git pull' to
> update but I prefer to see what's changed before updating.

git fetch
git diff HEAD..origin/master
# hmm, looks okay, now let's update
git pull

Cheers,

Marcus

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkpB2qwACgkQXjXn6TzcAQkt9gCg5XyFXEo4HmZLe7051isBNLKA
SWQAn25QrqUEsJ58hs5FczyBJAGp0vZg
=liE/
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

   http://xircles.codehaus.org/manage_email

[grailsOnUbuntu]

gitk or qgit both work decent for me, but not sure if they would quite meet all of what you are looking for. a co-worker of mine uses tortoise git (windows) and has good things to say.

On Wed, Jun 24, 2009 at 5:35 AM, Dmitriy Kopylenko <dmitriy.kopylenko@...> wrote:

Or after you've done the fetch, you could simply do 'git merge origin/master'

Cheers,
Dmitriy.

2009/6/24 Marcus Better <marcus@...>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Burt Beckwith wrote:
> basically a wrapper for 'git log'. I know I can just run 'git pull' to
> update but I prefer to see what's changed before updating.

git fetch
git diff HEAD..origin/master
# hmm, looks okay, now let's update
git pull

Cheers,

Marcus

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkpB2qwACgkQXjXn6TzcAQkt9gCg5XyFXEo4HmZLe7051isBNLKA
SWQAn25QrqUEsJ58hs5FczyBJAGp0vZg
=liE/
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

   http://xircles.codehaus.org/manage_email