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-----
