Merge branch 'cr/tag'

* cr/tag:
Teach "git stripspace" the --strip-comments option
Make verify-tag a builtin.
builtin-tag.c: Fix two memory leaks and minor notation changes.
launch_editor(): Heed GIT_EDITOR and core.editor settings
Make git tag a builtin.

diff --cc Makefile
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc environment.c
index 2af12fd68968c5b6ceab645fd0142f4f30a6f87a,35d3f4b595872c39c640ca0f71e7846d3ad053f2..b5a6c69f7c1d214daa2556d04dd35e0976fc6e5e
--- 1/environment.c
--- 2/environment.c
+++ b/environment.c
@@@ -33,12 -33,9 +33,13 @@@ size_t delta_base_cache_limit = 16 * 10
  char *pager_program;
  int pager_in_use;
  int pager_use_color = 1;
+ char *editor_program;
  int auto_crlf = 0;    /* 1: both ways, -1: only when adding git objects */
  
 +/* This is set by setup_git_dir_gently() and/or git_default_config() */
 +char *git_work_tree_cfg;
 +static const char *work_tree;
 +
  static const char *git_dir;
  static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;
  

diff --cc git.c
Simple merge