diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-06 05:56:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-06 05:56:24 +0000 |
| commit | 4fbdd440748fc26b29440ef85b9d60919a96fcb0 (patch) | |
| tree | 4a2c9d11831441595005c13d866bb7340fa2723c /user-manual.txt | |
| parent | 10b7a34451b2849b893cd1002b8477307873ab30 (diff) | |
| download | git-htmldocs-4fbdd440748fc26b29440ef85b9d60919a96fcb0.tar.gz | |
Autogenerated HTML docs for v1.6.1-48-ge9b8
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/user-manual.txt b/user-manual.txt index d4b1e90f9..19f571ae3 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -59,7 +59,7 @@ project in mind, here are some interesting examples: ------------------------------------------------ # git itself (approx. 10MB download): $ git clone git://git.kernel.org/pub/scm/git/git.git - # the linux kernel (approx. 150MB download): + # the Linux kernel (approx. 150MB download): $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ------------------------------------------------ @@ -1009,7 +1009,7 @@ $ git init If you have some initial content (say, a tarball): ------------------------------------------------- -$ tar -xzvf project.tar.gz +$ tar xzvf project.tar.gz $ cd project $ git init $ git add . # include everything below ./ in the first commit: @@ -1340,7 +1340,7 @@ These will display all commits which exist only on HEAD or on MERGE_HEAD, and which touch an unmerged file. You may also use linkgit:git-mergetool[1], which lets you merge the -unmerged files using external tools such as emacs or kdiff3. +unmerged files using external tools such as Emacs or kdiff3. Each time you resolve the conflicts in a file and update the index: |