mirror of
https://github.com/git/git.git
synced 2024-11-17 22:44:49 +01:00
Merge branch 'master' into next
* master: Fix "git help -a" terminal autosizing diff-index: fix compilation warnings.
This commit is contained in:
commit
e431e4cd7d
3 changed files with 1 additions and 2 deletions
|
@ -3,6 +3,7 @@
|
|||
*
|
||||
* Builtin help-related commands (help, usage, version)
|
||||
*/
|
||||
#include <sys/ioctl.h>
|
||||
#include "cache.h"
|
||||
#include "builtin.h"
|
||||
#include "exec_cmd.h"
|
||||
|
|
|
@ -11,7 +11,6 @@ COMMON_DIFF_OPTIONS_HELP;
|
|||
int main(int argc, const char **argv)
|
||||
{
|
||||
struct rev_info rev;
|
||||
int match_missing = 0;
|
||||
int cached = 0;
|
||||
int i;
|
||||
|
||||
|
|
1
git.c
1
git.c
|
@ -8,7 +8,6 @@
|
|||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include "git-compat-util.h"
|
||||
#include "exec_cmd.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue