[PLUG] [Announce] teamgit v0.0.10 - visual mergetool

Abhijit Bhopatkar bain at devslashzero.com
Sat Mar 28 02:55:49 PDT 2009


Hi people,
teamGit is a functional git gui written in qt, its ultimate aim is to
add functionality on top of git targeted at small closely knit teams.

I have tagged the repo with v0.0.10!!!
You can now get the .deb from ubuntu intrepid ppa
deb http://ppa.launchpad.net/bain-devslashzero/ubuntu intrepid main
package name is teamgit.
The main project website is http://www.devslashzero.com/teamgit

Changes from v0.0.9 include a visual interactive merge conflict
resolution.

Changelog from v0.0.9 follows
Abhijit Bhopatkar (32):
      Revert "Check, whether valid data is parseable or not"
      guifycommanddialogimpl.cpp: Avoid crashing for unparsable man
pages
      gitprocess: whitespace cleanup
      Add slot to check for merge conflicts
      Add merge conflict label
      Add merge conflict checking in refresh
      settings_ui: Add mergetool path text box and select button
      Move git specific settings from mainwindow to settings for easier
management
      Add merge tool path setting
      Add mergetool selction and fix writing it to settings file
      whitespace fixes
      Fix merge conflict label
      Merge branch 'master' of git://gitorious.org/teamgit/mainline
      Show files with merge conflicts only once
      Move GIT_INVOKE from mainwindowsimpl to gitthread
      Added merge dialog ui file
      Added merge dialog implementation
      Added merge dialog file to the qmake project
      Execute merge dialog when merge conflict label is clicked
      Connect filediff signal from git thread to mergedialog
      Show conflicting files in the merge dialog
      Added slot for getting merge conflict file's contents
      Gather conflicting file contents for unmerged files
      Disable merge tool options group box
      Fix: Clear previous contents in merge dialog on init
      gitprocess: append the filename to the conflict contents signal
      Disable the mergetool settings
      mergedialog: execute meld to resolve merge conflict
      Set commit message in commit dialog if COMMIT_EDITMSG exists
      diffviewer: Move font setting from mainwindowimpl to diffviewer
      User .git/MERGE_MSG instead of COMMIT_EDITMSG
      Fix merege conflict message while commiting

Terje Rosten (1):
      fixing .desktop file




More information about the plug-mail mailing list