# git documentation

3 messages from 2009-01-06 to 2009-01-06. Participants: david@lang.hm, Jakub Narebski, Miklos Vajna.
Thread: https://gitlist.dev/t/17000

## Jakub Narebski, 2009-01-06 01:07

Subject: Re: git documentation
Message-ID: <m33afxb5tw.fsf@localhost.localdomain>
URL: https://gitlist.dev/e/m33afxb5tw.fsf%40localhost.localdomain
In-Reply-To: <alpine.DEB.1.10.0901051745280.28514@asgard.lang.hm>

```
David Lang <david@lang.hm> writes:

> On lwn there is a comment (under the GNOME survey topic)
> http://lwn.net/Articles/313435/
> 
> The Shlomi Fish "Better SCM" site for example is very clear that Git
> won't do a merge across a rename. It even has a citation for this
> claim. But as a Git user who has actually done a merge across a rename
> I know it works just fine, and anyone familiar with Git's internals
> will guess immediately why. Yet probably there is no line of
> documentation on the Git site or elsewhere that I can quote to justify
> adding a "Yes" to the comparison.

I have tried to add info about Git to Better SCM quite a long time
ago; it was finally added by (IIRC) Alexey Mahotkin for
http://versioncontrolblog.com and sent for inclusion in Better SCM to
Shlomi Fish.

Unfortunately it contains some factual errors. I have sent corrections
to Alexey, but didn't finish it:
  "Git at Better SCM Initiative comparison of VCS (long)"
  http://article.gmane.org/gmane.comp.version-control.git/97253
(see also other posts in this thread, and other posts with the same,
or similar, subject on git mailing list).

-- 
Jakub Narebski
Poland
ShadeHawk on #git

```

## Miklos Vajna, 2009-01-06 01:46

Subject: Re: git documentation
Message-ID: <20090106014622.GA21154@genesis.frugalware.org>
URL: https://gitlist.dev/e/20090106014622.GA21154%40genesis.frugalware.org
In-Reply-To: <alpine.DEB.1.10.0901051745280.28514@asgard.lang.hm>

```
On Mon, Jan 05, 2009 at 05:46:56PM -0800, david@lang.hm wrote:
> why. Yet probably there is no line of documentation on the Git site or 
> elsewhere that I can quote to justify adding a "Yes" to the comparison.

I think it's documented in Documentation/merge-strategies.txt, under the
'recursive' merge strategy:

"Additionally this can detect and handle merges involving renames."

```

## david@lang.hm, 2009-01-06 01:46

Subject: git documentation
Message-ID: <alpine.DEB.1.10.0901051745280.28514@asgard.lang.hm>
URL: https://gitlist.dev/e/alpine.DEB.1.10.0901051745280.28514%40asgard.lang.hm

```
on lwn there is a comment (under the GNOME survey topic)
http://lwn.net/Articles/313435/

The Shlomi Fish "Better SCM" site for example is very clear that Git won't 
do a merge across a rename. It even has a citation for this claim. But as 
a Git user who has actually done a merge across a rename I know it works 
just fine, and anyone familiar with Git's internals will guess immediately 
why. Yet probably there is no line of documentation on the Git site or 
elsewhere that I can quote to justify adding a "Yes" to the comparison.


sounds like a missing piece of documentation that someone should be able 
to fill in fairly easily.

David Lang

```
