diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-10 01:37:05 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-10 01:37:05 +0400 |
| commit | a4043aeafed7962716a513e38ca1d5e192e7e831 (patch) | |
| tree | e48b94c2e8073ad86e2e8e0801766e217e0397b1 /environment.c | |
| parent | 1ee740e66975adbab080301ebd364e253be3d513 (diff) | |
| parent | d050464541d51ab65863218d93b351de3392f476 (diff) | |
Merge branch 'jc/request-pull-show-head-4'
* jc/request-pull-show-head-4:
request-pull: use the annotated tag contents
fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error
environment.c: Fix an sparse "symbol not declared" warning
builtin/log.c: Fix an "Using plain integer as NULL pointer" warning
fmt-merge-msg: use branch.$name.description
request-pull: use the branch description
request-pull: state what commit to expect
request-pull: modernize style
branch: teach --edit-description option
format-patch: use branch description in cover letter
branch: add read_branch_desc() helper function
Conflicts:
builtin/branch.c
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 0bee6a7a88..2c41d7d6cb 100644 --- a/environment.c +++ b/environment.c @@ -9,6 +9,7 @@ */ #include "cache.h" #include "refs.h" +#include "fmt-merge-msg.h" char git_default_email[MAX_GITNAME]; char git_default_name[MAX_GITNAME]; @@ -59,6 +60,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE; char *notes_ref_name; int grafts_replace_parents = 1; int core_apply_sparse_checkout; +int merge_log_config = -1; struct startup_info *startup_info; /* Parallel index stat data preload? */ |