diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-02 18:05:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-02 18:05:33 -0800 |
| commit | c954d33da1c878788e7c01a50a5c1066622802c6 (patch) | |
| tree | 1a4d0fb29d1b3b66d0b7249490555604297a389d /Documentation | |
| parent | cd1464083cd9e61a55148c21fd9b8eb3bf76d190 (diff) | |
| parent | ba158a32b9e237912ebe7dfe7bd56e2c531cb062 (diff) | |
| download | git-c954d33da1c878788e7c01a50a5c1066622802c6.tar.gz git-c954d33da1c878788e7c01a50a5c1066622802c6.tar.xz | |
Merge branch 'maint'
* maint:
git-clone documentation didn't mention --origin as equivalent of -o
Minor grammar fixes for git-diff-index.txt
link_temp_to_file: call adjust_shared_perm() only when we created the directory
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-clone.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-diff-index.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index f973c6431..86060472a 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -75,6 +75,7 @@ OPTIONS this option is used, neither the `origin` branch nor the default `remotes/origin` file is created. +--origin <name>:: -o <name>:: Instead of using the branch name 'origin' to keep track of the upstream repository, use <name> instead. Note diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index 9cd43f105..2df581c2c 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -54,7 +54,7 @@ If '--cached' is specified, it allows you to ask: For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly -*what* you are going to commit is without having to write a new tree +*what* you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do git-diff-index --cached HEAD @@ -68,7 +68,7 @@ matches my working directory. But doing a "git-diff-index" does: -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c -You can trivially see that the above is a rename. +You can see easily that the above is a rename. In fact, "git-diff-index --cached" *should* always be entirely equivalent to actually doing a "git-write-tree" and comparing that. Except this one is much |