projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8e2c54 fb8024b)
Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:16:33 +0000 (19:16 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:16:33 +0000 (19:16 -0700)
with minor hand resolving on git-tag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1  2 
Documentation/git-tag.txt patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history
git-tag.sh patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-tag.txt
index 1eafeef,e11f51c..3984812
--- 1/Documentation/git-tag.txt
--- 2/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@@ -7,10 -6,9 +6,9 @@@ NAM
  git-tag -  Create a tag object signed with GPG
  
  
- 
  SYNOPSIS
  --------
- 'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg>] <name>
 -'git-tag' [-a | -s] [-f] [-m <msg>] <name> [<head>]
++'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg>] <name> [<head>]
  
  DESCRIPTION
  -----------
diff --cc Makefile
index a201187,b8ca504..ac384c7
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -265,16 -246,9 +265,16 @@@ ifdef NEEDS_NS
        SIMPLE_LIB += -lnsl
  endif
  ifdef NO_STRCASESTR
-       DEFINES += -Dstrcasestr=gitstrcasestr
+       DEFINES += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
        LIB_OBJS += compat/strcasestr.o
  endif
 +ifdef NO_MMAP
 +      DEFINES += -Dmmap=gitfakemmap -Dmunmap=gitfakemunmap -DNO_MMAP
 +      LIB_OBJS += compat/mmap.o
 +endif
 +ifdef NO_IPV6
 +      DEFINES += -DNO_IPV6 -Dsockaddr_storage=sockaddr_in
 +endif
  
  ifdef PPC_SHA1
        SHA1_HEADER = "ppc/sha1.h"
diff --cc git-tag.sh
index 9afdf5c,400bdb9..25c1a0e
--- 1/git-tag.sh
--- 2/git-tag.sh
+++ b/git-tag.sh
@@@ -4,7 -4,7 +4,7 @@@
  . git-sh-setup || die "Not a git archive"
  
  usage () {
-     echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f] [-m <msg>] <tagname>"
 -    echo >&2 "Usage: git-tag [-a | -s] [-f] [-m "tag message"] tagname [head]"
++    echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f] [-m <msg>] <tagname> [<head>]"
      exit 1
  }
  
The core git plumbing