Document git-rebase behavior on conflicts.
[git/gitweb.git] / Documentation / git-unpack-file.txt
blob213dc8196b90170cc14e35f7c637815b39a7ff8d
1 git-unpack-file(1)
2 ==================
4 NAME
5 ----
6 git-unpack-file - Creates a temporary file with a blob's contents
10 SYNOPSIS
11 --------
12 'git-unpack-file' <blob>
14 DESCRIPTION
15 -----------
16 Creates a file holding the contents of the blob specified by sha1. It
17 returns the name of the temporary file in the following format:
18         .merge_file_XXXXX
20 OPTIONS
21 -------
22 <blob>::
23         Must be a blob id
25 Author
26 ------
27 Written by Linus Torvalds <torvalds@osdl.org>
29 Documentation
30 --------------
31 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
33 GIT
34 ---
35 Part of the gitlink:git[7] suite