diff options
| author |  Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> | 2008-03-21 16:25:18 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-22 23:20:01 -0700 |
| commit | 9b33fa08b2d9507f8ffefe7649a59d23b4176185 (patch) | |
| tree | ee851120df148f20025d1fd27912ee94fb9ee79e /ll-merge.h | |
| parent | Make git-svn tests behave better on OS X (diff) | |
| download | tgif-9b33fa08b2d9507f8ffefe7649a59d23b4176185.tar.xz | |
fast-import: Document the effect of "merge" with no "from" in a commit
The fast-import documentation currently does not document the behaviour
of "merge" when there is no "from" in a commit. This patch adds a
description of what happens: the commit is created with a parent, but
no files. This behaviour is equivalent to "from" followed by
"filedeleteall".
Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions