From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Jul 2008 00:49:59 +0000 (-0700)
Subject: Merge branch 'mv/dashless'
X-Git-Tag: v1.6.0-rc0~36
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1f8dc671557a7330eaee9c0296bfad669d26a1b8?ds=inline;hp=-c

Merge branch 'mv/dashless'

* mv/dashless:
make remove-dashes: apply to scripts and programs as well, not just to builtins
git-bisect: use dash-less form on git bisect log
t1007-hash-object.sh: use quotes for the test description
t0001-init.sh: change confusing directory name
---

1f8dc671557a7330eaee9c0296bfad669d26a1b8
diff --combined Makefile
index 9b52071b73,2b54d927b6..75c4ead47a
--- a/Makefile
+++ b/Makefile
@@@ -240,6 -240,7 +240,6 @@@ SCRIPT_SH += git-lost-found.s
  SCRIPT_SH += git-merge-octopus.sh
  SCRIPT_SH += git-merge-one-file.sh
  SCRIPT_SH += git-merge-resolve.sh
 -SCRIPT_SH += git-merge.sh
  SCRIPT_SH += git-mergetool.sh
  SCRIPT_SH += git-parse-remote.sh
  SCRIPT_SH += git-pull.sh
@@@ -362,7 -363,6 +362,7 @@@ LIB_H += quote.
  LIB_H += reflog-walk.h
  LIB_H += refs.h
  LIB_H += remote.h
 +LIB_H += rerere.h
  LIB_H += revision.h
  LIB_H += run-command.h
  LIB_H += sha1-lookup.h
@@@ -447,7 -447,6 +447,7 @@@ LIB_OBJS += read-cache.
  LIB_OBJS += reflog-walk.o
  LIB_OBJS += refs.o
  LIB_OBJS += remote.o
 +LIB_OBJS += rerere.o
  LIB_OBJS += revision.o
  LIB_OBJS += run-command.o
  LIB_OBJS += server-info.o
@@@ -514,7 -513,6 +514,7 @@@ BUILTIN_OBJS += builtin-ls-remote.
  BUILTIN_OBJS += builtin-ls-tree.o
  BUILTIN_OBJS += builtin-mailinfo.o
  BUILTIN_OBJS += builtin-mailsplit.o
 +BUILTIN_OBJS += builtin-merge.o
  BUILTIN_OBJS += builtin-merge-base.o
  BUILTIN_OBJS += builtin-merge-file.o
  BUILTIN_OBJS += builtin-merge-ours.o
@@@ -1298,7 -1296,7 +1298,7 @@@ check: common-cmds.
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
  remove-dashes:
- 	./fixup-builtins $(BUILT_INS)
+ 	./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)
  
  ### Installation rules