Your comments

Very nice option !! Can a button be added just aside the view type drop down ? So when you select branch or merge coloring it would be available and really visible ?

Currently, in the commit details view there is a "on branches" info. This could simply be displayed as a tooltip when overring the commit bullet in the commits view...

Just tested, this is working great indeed ! Event if I pull from another branch. Here is what I get :

Background operations doesn't seem to trigger this red label though...

When was this branch color feature added ? I face the problem many times and it never occured to me "orphan" branches changed colors ? And I use last build since quite some time now...

Here is what you're getting in SmartGit, one file with a corresponding diff window on the whole file :



And here is what is displayed in SourceTree, same commit : one little diff per hunk modified. Very convenient to see all modifications made to a file very quickly, and plus it allows very easily to stage hunk by hunk (which is possible in SmartGit but in my opinion far too complex, and lacks A LOT clarity - but that is a different subject) :



Can the branches "attached" to a commit be displayed when hovering the commit node ? Or even the whole commit line ?

Each developper might have its context...

For me, the git client is here to help, the main work happens in my IDE. So I expect the diff tool in SmartGit to see quickly differences, not display the whole code...

Ok, exactly same syntax as the [giflow*] tags in .git/config :)

So for exemple :


[gitflow "branch"]
 master = master
 develop = develop
[gitflow "prefix"]
 feature = feature/
 release = release/
 hotfix = hotfix/
 versiontag = 
 support = support/


I would recommend updating the doc to reflect this !

Ha thanks ! But what is the syntax of this .gitflow file ?