diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-22 20:18:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 20:18:37 -0700 |
| commit | bc38219f50ba9228945fba8e900d636f15082f16 (patch) | |
| tree | 06e090679892d927c141aac808b37a49de52466e /contrib | |
| parent | 3776ea9d7006f48c380e80ccc57db681f4e9adfb (diff) | |
| parent | 22e5e58a3c75b73764b860907e4d871195f276ac (diff) | |
| download | git-bc38219f50ba9228945fba8e900d636f15082f16.tar.gz | |
Merge branch 'maint'
* maint:
Typos in code comments, an error message, documentation
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/workdir/git-new-workdir | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir index 993cacf324..3ad2c0cea5 100755 --- a/contrib/workdir/git-new-workdir +++ b/contrib/workdir/git-new-workdir @@ -54,13 +54,13 @@ then die "destination directory '$new_workdir' already exists." fi -# make sure the the links use full paths +# make sure the links use full paths git_dir=$(cd "$git_dir"; pwd) # create the workdir mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!" -# create the links to the original repo. explictly exclude index, HEAD and +# create the links to the original repo. explicitly exclude index, HEAD and # logs/HEAD from the list since they are purely related to the current working # directory, and should not be shared. for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn |