diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-14 22:12:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-14 22:12:38 -0800 |
| commit | ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd (patch) | |
| tree | b070131f1b35de05ddef6d4519373d1aacc96c1a | |
| parent | a2df1fb2e52a49bf6b17b352581510efd851f337 (diff) | |
| parent | 9e77353e0ea6e9e6d88ad1943570afb526d54a16 (diff) | |
| download | git-ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd.tar.gz git-ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: git-svn: fix example for centralized SVN clone
Documentation: fix links to "everyday.html"
revision.c: use proper data type in call to sizeof() within xrealloc
| -rw-r--r-- | Documentation/git-svn.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitcore-tutorial.txt | 6 | ||||
| -rw-r--r-- | Documentation/gitglossary.txt | 6 | ||||
| -rw-r--r-- | revision.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 84c8f3cde..ba94cd17d 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -544,6 +544,8 @@ have each person clone that repository with 'git-clone': git remote add origin server:/pub/project git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' git fetch +# Create a local branch from one of the branches just fetched + git checkout -b master FETCH_HEAD # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) git svn init http://svn.example.com/project # Pull the latest changes from Subversion diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index a417e592a..61fc5d7be 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -1690,8 +1690,10 @@ to follow, not easier. SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], -linkgit:everyday[7], linkgit:gitcvs-migration[7], +linkgit:gittutorial[7], +linkgit:gittutorial-2[7], +linkgit:gitcvs-migration[7], +link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual] GIT diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt index 565719ed5..d77a45aed 100644 --- a/Documentation/gitglossary.txt +++ b/Documentation/gitglossary.txt @@ -16,8 +16,10 @@ include::glossary-content.txt[] SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], -linkgit:everyday[7], linkgit:gitcvs-migration[7], +linkgit:gittutorial[7], +linkgit:gittutorial-2[7], +linkgit:gitcvs-migration[7], +link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual] GIT diff --git a/revision.c b/revision.c index 9dc55d400..db60f06c9 100644 --- a/revision.c +++ b/revision.c @@ -995,7 +995,7 @@ static void add_ignore_packed(struct rev_info *revs, const char *name) int num = ++revs->num_ignore_packed; revs->ignore_packed = xrealloc(revs->ignore_packed, - sizeof(const char **) * (num + 1)); + sizeof(const char *) * (num + 1)); revs->ignore_packed[num-1] = name; revs->ignore_packed[num] = NULL; } |