diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
| commit | 8fa330335f9eb465724ed778464502f844e930ae (patch) | |
| tree | 2161500fbdc1ca52f0e1bf15c9f0ab90737d5d01 /doc | |
| parent | ef4757afa5d31ff6a6c09e3410c889f152826f4f (diff) | |
| parent | 67445334e71eaf6138561eee8e5561733a59fc69 (diff) | |
| download | pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.gz pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
lib/libalpm/po/fi.po
lib/libalpm/po/libalpm.pot
po/de.po
po/fi.po
src/pacman/po/pacman.pot
src/pacman/util.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/PKGBUILD.5.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 393a2f2a..af3a3880 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -401,8 +401,7 @@ from (e.g., 'makepkg-git', 'mplayer-svn'). The SVN module to fetch. *Git*:: - The generated pkgver will be one formatted by the 'git-describe' - command, with '-' characters converted to '_' characters. + The generated pkgver will be the date the package is built. *_gitroot*;; The URL (all protocols supported) to the GIT repository. |