diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-08-10 23:17:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-10 23:17:46 -0700 |
| commit | 55d1932bce99d83fa0d891331fe3f3562d33af2e (patch) | |
| tree | cfd50a538a7214041f60dba488e3e48462e2a579 /environment.c | |
| parent | 98e79f63be7e2cf043bd3150ae9ac0c8d118ce61 (diff) | |
| parent | f653aee5a37b909e772d612eb7e226f09fd2f3d3 (diff) | |
| download | git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.gz git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.xz | |
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.
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 2af12fd68..b5a6c69f7 100644 --- a/environment.c +++ b/environment.c @@ -33,6 +33,7 @@ size_t delta_base_cache_limit = 16 * 1024 * 1024; 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() */ |