Can Git Cola provide these features - diff, revision history, version numbers, megre, conflict auto resolve, etc options

[Naveen Shreevatsa]

Hi Git Followers,

Can Git Cola provide these features - diff, revision history, version numbers, megre, conflict auto resolve, etc options?
Is there any comprehensive document for Git Cola?

Thanks,
Git Enthusiast

[David Aguilar]

On Tue, Jun 10, 2014 at 10:51:44AM -0700, Naveen Shreevatsa wrote:
> Hi Git Followers,
>
> Can Git Cola provide these features - diff, revision history, version numbers,
> megre, conflict auto resolve, etc options?

Diff -- Yes, and we can also delegate to "git difftool" as needed.

History -- Yes via the "DAG" (git-dag) tool, and we can also delegate to gitk

Version Numbers -- Do you mean SHA-1s / Commit IDs? Same as above.

Merge -- Yes

Conflict auto resolve -- Yes; we delegate to "git mergetool", which
gives you access to an extensive list of tools.

etc -- Interactive incremental staging, interactive rebase, stashing, ...

> Is there any comprehensive document for Git Cola?

See the doc/ directory in the source tree.

You can run "make html" or "make man" in there to generate documentation.
"man git-cola", "man git-dag", or

http://git-cola.github.io/share/doc/git-cola/html/index.html

cheers,
--
David

[Naveen Shreevatsa]

Hi David,

Thanks for your reply, regarding the version numbers I meant the commit IDs that can be view in the tree structure in the GUI.
for example,
if there are 10 commits for same file, will there be 10 version numbers for the same file or will there be commit numbers which can be viewed in the GUI itself?

Regards,
Naveen

[David Aguilar]

On Tue, Jun 10, 2014 at 12:41:24PM -0700, Naveen Shreevatsa wrote:
> On Tuesday, June 10, 2014 2:11:14 PM UTC-4, David Aguilar wrote:
>
> Version Numbers -- Do you mean SHA-1s / Commit IDs? Same as above.
>

> Thanks for your reply, regarding the version numbers I meant the commit IDs
> that can be view in the tree structure in the GUI.
> for example,
> if there are 10 commits for same file, will there be 10 version numbers for the
> same file or will there be commit numbers which can be viewed in the GUI
> itself?

You can certainly filter by filename in the git-dag tool.
We expose everything that "git log" can do; just type it into
the query field.

It has auto-complete too (like the shell completions).

Using the GUI is very similar to using "git log" on the
command-line plus it has a very nice interactive graph.
--
David

[Naveen Shreevatsa]

Hi David,

Is git cola a commercial or non-commercial?

I have a question here, if it is commercial or non-commercial can this be used for commercial?

Thanks,

Naveen

[David Aguilar]

On Wed, Jun 11, 2014 at 02:01:17PM -0700, Naveen Shreevatsa wrote:
> Hi David,
>
> Is git cola a commercial or non-commercial?
> I have a question here, if it is commercial or non-commercial can this be used
> for commercial?

git cola is free software licensed under the GPL v2.

https://github.com/git-cola/git-cola/blob/master/COPYING
--
David