Browse Source

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
maint
Junio C Hamano 16 years ago
parent
commit
ea4f2bd39d
  1. 2
      Documentation/git-svn.txt
  2. 6
      Documentation/gitcore-tutorial.txt
  3. 6
      Documentation/gitglossary.txt
  4. 2
      revision.c

2
Documentation/git-svn.txt

@ -544,6 +544,8 @@ have each person clone that repository with 'git-clone': @@ -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

6
Documentation/gitcore-tutorial.txt

@ -1690,8 +1690,10 @@ to follow, not easier. @@ -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

6
Documentation/gitglossary.txt

@ -16,8 +16,10 @@ include::glossary-content.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

2
revision.c

@ -995,7 +995,7 @@ static void add_ignore_packed(struct rev_info *revs, const char *name) @@ -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;
}

Loading…
Cancel
Save