zoukankan      html  css  js  c++  java
  • git diff 文件没有任何输出的解决方法

    1. git status

    有提示文件修改 例如:

    [jason@vm-www1 d]$ git status
    # On branch master
    # Changed but not updated:
    # (use "git add <file>..." to update what will be committed)
    # (use "git checkout -- <file>..." to discard changes in working directory)
    #
    # modified: theme-images.php
    #
    # Untracked files:
    # (use "git add <file>..." to include in what will be committed)
    #
    # ../../../nginx.conf
    no changes added to commit (use "git add" and/or "git commit -a")

    2. 使用git diff  theme-images.php

    任何输出都没有

    3. 解决方法:

    ---------------------- 未配置账号、邮箱 使用以下命令设置--------------------------------

    git config --global user.name "jason"   #修改

    git config --global user.email "json@fu101.com" #修改

    -------------------------------------------------------------

    git --no-pager diff  theme-images.php

    有修改的日志

    git config --global core.pager "more"

    +++++++++++++++++++++++++++++++

    [jason@vm-www1 d]$ git diff theme-images.php
    diff --git a/wp-content/themes/d/theme-images.php b/wp-content/themes/d/theme-images.php
    index 6f2023f..88e3118 100644
    --- a/wp-content/themes/d/theme-images.php
    +++ b/wp-content/themes/d/theme-images.php
    @@ -1,4 +1,4 @@
    - <?php
    +<?php

    /*-----------------------------------------------------------------------------------*/
    // Add theme support for Featured Images/Post Thumnbnails
    [jason@vm-www1 d]$

    git config --global color.diff "auto"

  • 相关阅读:
    Java 如何有效地避免OOM:善于利用软引用和弱引用
    LRU缓存实现(Java)
    Java实现LRU(最近最少使用)缓存
    HashSet,TreeSet和LinkedHashSet的区别
    IIS-详解IIS中URL重写工具的规则条件(Rule conditions)
    IIS-代理
    IIS-新建网站
    IIS-反向代理配置&&插件安装
    IIS-C#项目环境搭建
    IIS-Windows10如何安装
  • 原文地址:https://www.cnblogs.com/zhongbin/p/3834183.html
Copyright © 2011-2022 走看看