summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorEyvind Bernhardsen <eyvind-git@orakel.ntnu.no>2008-03-21 15:25:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-23 06:20:01 (GMT)
commit9b33fa08b2d9507f8ffefe7649a59d23b4176185 (patch)
treeee851120df148f20025d1fd27912ee94fb9ee79e /remote.h
parent3644da7214055d2e84223b45dfca42d437fb7ea7 (diff)
downloadgit-9b33fa08b2d9507f8ffefe7649a59d23b4176185.zip
git-9b33fa08b2d9507f8ffefe7649a59d23b4176185.tar.gz
git-9b33fa08b2d9507f8ffefe7649a59d23b4176185.tar.bz2
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 'remote.h')
0 files changed, 0 insertions, 0 deletions