diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-11 12:09:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-11 12:09:12 -0700 |
| commit | 3e08f5db65bcfe3ad238ee0de1cac2da84953cf3 (patch) | |
| tree | ce9480bd5f59c93ed232a94e58f99e5f1c59940b /wt-status.h | |
| parent | 32a27b56662b1c7aa13f98c95f170ba5290c7559 (diff) | |
| parent | 32efcd91c6505ae28f87c0e9a3e2b3c0115017d8 (diff) | |
| download | git-3e08f5db65bcfe3ad238ee0de1cac2da84953cf3.tar.gz git-3e08f5db65bcfe3ad238ee0de1cac2da84953cf3.tar.xz | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
wt-status.h: declare global variables as extern
builtin-commit.c: add -u as short name for --untracked-files
git-repack: re-enable parsing of -n command line option
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.h b/wt-status.h index 02afaa60e..7d61410b1 100644 --- a/wt-status.h +++ b/wt-status.h @@ -28,8 +28,8 @@ struct wt_status { }; int git_status_config(const char *var, const char *value); -int wt_status_use_color; -int wt_status_relative_paths; +extern int wt_status_use_color; +extern int wt_status_relative_paths; void wt_status_prepare(struct wt_status *s); void wt_status_print(struct wt_status *s); |