diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-07-24 09:27:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-24 09:27:09 -0700 |
| commit | f87dd2152a6941dfa7f3ddaf599bc30f58562a98 (patch) | |
| tree | 308c66f7be4942b01b468e958cb7c9c64dd39131 /Makefile | |
| parent | git svn: fix shallow clone when upstream revision is too new (diff) | |
| parent | SunOS grep does not understand -C<n> nor -e (diff) | |
| download | tgif-f87dd2152a6941dfa7f3ddaf599bc30f58562a98.tar.xz | |
Merge branch 'maint'
* maint:
SunOS grep does not understand -C<n> nor -e
Fix export_marks() error handling.
git branch: clean up detached branch handling
git branch: avoid unnecessary object lookups
git branch: fix performance problem
do_one_ref(): null_sha1 check is not about broken ref
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -728,6 +728,7 @@ ifeq ($(uname_S),SunOS) NO_MKDTEMP = YesPlease NO_MKSTEMPS = YesPlease NO_REGEX = YesPlease + NO_EXTERNAL_GREP = YesPlease ifeq ($(uname_R),5.7) NEEDS_RESOLV = YesPlease NO_IPV6 = YesPlease |