![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> | |
| Fri, 21 Mar 2008 15:25:18 +0000 (16:25 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 23 Mar 2008 06:20:01 +0000 (23:20 -0700) | ||
| commit | 9b33fa08b2d9507f8ffefe7649a59d23b4176185 | |
| tree | ee851120df148f20025d1fd27912ee94fb9ee79e | tree | snapshot |
| parent | 3644da7214055d2e84223b45dfca42d437fb7ea7 | commit | diff |
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>
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>
| Documentation/git-fast-import.txt | diff | blob | history |