diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-17 16:16:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-17 16:16:48 -0800 |
| commit | 69bc0e22d37db4fa9875b717a64949bbfce4ebdf (patch) | |
| tree | adc790d89c9875d027fd996f402d05a40b0298bb /Documentation/tutorial-2.txt | |
| parent | 2afc29aa84f518906c50a1f005e3d715babb5c20 (diff) | |
| parent | 21b4875a51dd9aae68a1c4932d54cad9fc589401 (diff) | |
| download | git-69bc0e22d37db4fa9875b717a64949bbfce4ebdf.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.5.0.1
Convert update-index references in docs to add.
Attempt to improve git-rebase lead-in description.
Do not take mode bits from index after type change.
git-blame: prevent argument parsing segfault
Make gitk save and restore window pane position on Linux and Cygwin.
Make gitk save and restore the user set window position.
[PATCH] gitk: Use show-ref instead of ls-remote
[PATCH] Make gitk work reasonably well on Cygwin.
[PATCH] gitk - remove trailing whitespace from a few lines.
Change git repo-config to git config
Diffstat (limited to 'Documentation/tutorial-2.txt')
| -rw-r--r-- | Documentation/tutorial-2.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt index 8d89992712..af8d43bd12 100644 --- a/Documentation/tutorial-2.txt +++ b/Documentation/tutorial-2.txt @@ -227,7 +227,7 @@ $ git diff @@ -1 +1,2 @@ hello world! +hello world, again -$ git update-index file.txt +$ git add file.txt $ git diff ------------------------------------------------ @@ -260,7 +260,7 @@ hello world! hello world, again ------------------------------------------------ -So what our "git update-index" did was store a new blob and then put +So what our "git add" did was store a new blob and then put a reference to it in the index file. If we modify the file again, we'll see that the new modifications are reflected in the "git-diff" output: |