git用法

原理说明https://www.jianshu.com/p/5ea23529527b/

1. git diff Avengers_ui/app/src/main/java/com/weiqing/tanyou/ui/ScanHelper.java

结尾出现^M，说是编辑器换行符不一样的问题，用git config --global core.whitespace cr-at-eol命令可已解决。

2.git reset的用法

git reset HEAD撤销上一次commit

git reset commitID本地回退到某一次提交的数据

3. git reflog

git reflog可以查看近段时间所有的git操作

➜  git-openssl ls
git-2.17.1  git_2.17.1-1ubuntu0.7.debian.tar.xz  git_2.17.1-1ubuntu0.7.dsc  git_2.17.1.orig.tar.xz
➜  git-openssl mv git-2.17.1 git-2.17.1_old/
➜  git-openssl ls
git_2.17.1-1ubuntu0.7.debian.tar.xz  git_2.17.1-1ubuntu0.7.dsc  git-2.17.1_old  git_2.17.1.orig.tar.xz
➜  git-openssl mv git-2.17.1 git-2.17.1_old/
mv: cannot stat 'git-2.17.1': No such file or directory
➜  git-openssl dpkg-source -x git_2.17.1-1ubuntu0.7.dsc
gpgv: Signature made Tue 21 Apr 2020 03:46:14 AM CST
gpgv:                using RSA key 50C4A0DDCF31E452CEB19B516569D855A744BE93




➜  git-openssl cd git-2.17.1
➜  git-2.17.1 sudo sed -i 's/libcurl4-gnutls-dev/libcurl4-openssl-dev/g' debian/control

 删除TEST =test

CC =gcc
CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS)
TEST =test
OPTS =NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core \
  libexecdir=/usr/lib/git-core \
  mandir=/usr/share/man htmldir=/usr/share/doc/git/html \

➜  git-2.17.1 sudo apt-get install libcurl4-openssl-dev

dpkg-deb: building package 'git-email' in '../git-email_2.17.1-1ubuntu0.7_all.deb'.
dpkg-deb: building package 'git-daemon-sysvinit' in '../git-daemon-sysvinit_2.17.1-1ubuntu0.7_all.deb'.
dpkg-deb: building package 'git-doc' in '../git-doc_2.17.1-1ubuntu0.7_all.deb'.
dpkg-deb: building package 'gitk' in '../gitk_2.17.1-1ubuntu0.7_all.deb'.
dpkg-deb: building package 'git-dbgsym' in 'debian/.debhelper/scratch-space/build-git/git-dbgsym_2.17.1-1ubuntu0.7_amd64.deb'.
	Renaming git-dbgsym_2.17.1-1ubuntu0.7_amd64.deb to git-dbgsym_2.17.1-1ubuntu0.7_amd64.ddeb
 dpkg-genbuildinfo --build=binary
 dpkg-genchanges --build=binary >../git_2.17.1-1ubuntu0.7_amd64.changes
dpkg-genchanges: info: binary-only upload (no source code included)
 dpkg-source --after-build git-2.17.1
dpkg-buildpackage: info: binary-only upload (no source included)
➜  git-2.17.1 sudo dpkg -i ../git_2.17.1-1ubuntu0.4_amd64.deb
dpkg: error: cannot access archive '../git_2.17.1-1ubuntu0.4_amd64.deb': No such file or directory

在上一层目录生成 git-dbgsym_2.17.1-1ubuntu0.7_amd64.ddeb

➜  git-openssl ls
git-2.17.1                             git-all_2.17.1-1ubuntu0.7_all.deb              git-gui_2.17.1-1ubuntu0.7_all.deb
git_2.17.1-1ubuntu0.7_amd64.buildinfo  git-cvs_2.17.1-1ubuntu0.7_all.deb              gitk_2.17.1-1ubuntu0.7_all.deb
git_2.17.1-1ubuntu0.7_amd64.changes    git-daemon-run_2.17.1-1ubuntu0.7_all.deb       git-man_2.17.1-1ubuntu0.7_all.deb
git_2.17.1-1ubuntu0.7_amd64.deb        git-daemon-sysvinit_2.17.1-1ubuntu0.7_all.deb  git-mediawiki_2.17.1-1ubuntu0.7_all.deb
git_2.17.1-1ubuntu0.7.debian.tar.xz    git-dbgsym_2.17.1-1ubuntu0.7_amd64.ddeb        git-svn_2.17.1-1ubuntu0.7_all.deb
git_2.17.1-1ubuntu0.7.dsc              git-doc_2.17.1-1ubuntu0.7_all.deb              gitweb_2.17.1-1ubuntu0.7_all.deb
git-2.17.1_old                         git-el_2.17.1-1ubuntu0.7_all.deb
git_2.17.1.orig.tar.xz                 git-email_2.17.1-1ubuntu0.7_all.deb
➜  git-openssl sudo dpkg -i ../git_2.17.1-1ubuntu0.4_amd64.deb

在 git-2.17.1目录下执行

➜  git-2.17.1 sudo dpkg -i ../git_2.17.1-1ubuntu0.7_amd64.deb