diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
| commit | b2f6eab4027beaaa7415e70dad269bdc7cc27722 (patch) | |
| tree | 2e6088ca17b4042ccf9c658148cd5af55021c8a1 /builtin/add.c | |
| parent | vcs-svn: remove spurious semicolons (diff) | |
| parent | Prepare draft release notes to 1.7.4.2 (diff) | |
| download | tgif-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.xz | |
Merge branch 'maint'
* maint:
Prepare draft release notes to 1.7.4.2
gitweb: highlight: replace tabs with spaces
make_absolute_path: return the input path if it points to our buffer
valgrind: ignore SSE-based strlen invalid reads
diff --submodule: split into bite-sized pieces
cherry: split off function to print output lines
branch: split off function that writes tracking info and commit subject
standardize brace placement in struct definitions
compat: make gcc bswap an inline function
enums: omit trailing comma for portability
Conflicts:
RelNotes
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/add.c b/builtin/add.c index f7a17e43f6..e127d5a68b 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -21,8 +21,7 @@ static const char * const builtin_add_usage[] = { static int patch_interactive, add_interactive, edit_interactive; static int take_worktree_changes; -struct update_callback_data -{ +struct update_callback_data { int flags; int add_errors; }; |