[git-users] Re: Git Clone Icon is not diplayes on explorer

2014-04-16 Thread Thomas Ferris Nicolaisen
On Wednesday, April 16, 2014 5:38:59 PM UTC+2, iand...@gmail.com wrote: > > Hello All > > I installed GIT (Git-1.9.2-preview20140411.exe and > TortoiseGit-1.7.14.0-64bit.msi) on Windows 7 enterprise and I am not able > to see the Git clone icon displayed on explorer. See picture below. > If you c

[git-users] Re: merge annotations in BASE file

2014-04-16 Thread Thomas Ferris Nicolaisen
On Wednesday, April 16, 2014 7:25:22 PM UTC+2, Michael Power wrote: > > I think this is caused by the complicated nature of the merge I am doing. > Here is the background. I start with a git project structured like the > following. For the sake of description this was release branch R1 > >> /p

Re: [git-users] Git working with other SCM tools

2014-04-16 Thread Magnus Therning
On Wed, Apr 16, 2014 at 01:06:53PM -0700, Rick H wrote: > Good afternoon, > > I have a question, as I'm new to Git and would like to understand > how to do what I need to do in the best possible way. > > I'm working for a fairly large company using a commericial source > control system that has b

[git-users] Git working with other SCM tools

2014-04-16 Thread Rick H
Good afternoon, I have a question, as I'm new to Git and would like to understand how to do what I need to do in the best possible way. I'm working for a fairly large company using a commericial source control system that has been around for a long time (ClearCase). We have a partner company in a

Re: [git-users] Git Clone Icon is not diplayes on explorer

2014-04-16 Thread Konstantin Khomoutov
On Wed, 16 Apr 2014 08:38:59 -0700 (PDT) iandr...@gmail.com wrote: > I installed GIT (Git-1.9.2-preview20140411.exe and > TortoiseGit-1.7.14.0-64bit.msi) on Windows 7 enterprise and I am not > able to see the Git clone icon displayed on explorer. See picture > below. > > I wonder if anyone has s

Re: [git-users] git log in XML format

2014-04-16 Thread Konstantin Khomoutov
On Wed, 16 Apr 2014 20:11:20 +0400 Konstantin Khomoutov wrote: [...] > The commit object has a very simple structure: > > > Key ":" SP Value LF > [Key ...] > LF > Message > [...] Sorry, of course there's no ":" between the key and the value in the headers -- I was thinking of HTTP whe

[git-users] Re: merge annotations in BASE file

2014-04-16 Thread Michael Power
I worked around the problem using these steps. 1. git merge toBisque 2. git mergetool -t p4merge 3. wait for git to prompt to run p4merge 4. In another command prompt use git show ${MERGE_BASE_HASH}:${FILE_PATH} > ${FILE_PATH_LESS_EXTENSION}.BASE.${MERGE_NUM}.${FILE_EXTENSION}

Re: [git-users] git log in XML format

2014-04-16 Thread Konstantin Khomoutov
On Wed, 16 Apr 2014 02:25:33 -0700 (PDT) Yves Goergen wrote: > I'm writing a build automation script (with PowerShell) for my > project and one of its tasks is to write all commit messages since > the last publishing into a text file so that I can edit the messages > into a simplified form for th

Re: [git-users] git log in XML format

2014-04-16 Thread Dale R. Worley
> From: Yves Goergen > I'd like to suggest adding the XML output format to the git log > command so that this information can be parsed without any > uncertainties caused by the actual commit message content. I don't > care much about the exact XML schema. The SVN schema may serve as a > starting

[git-users] git log in XML format

2014-04-16 Thread Yves Goergen
Hello, I'm writing a build automation script (with PowerShell) for my project and one of its tasks is to write all commit messages since the last publishing into a text file so that I can edit the messages into a simplified form for the user. (That's a kind of change log file for the user that