jkhhuse / blog Goto Github PK

$ git config --global user.name "Your Name"
$ git config --global user.email "[email protected]"

$ git status

$ cd dir
$ mkdir repo
$ git init

$ touch readme.txt
$ git add readme.txt

$ git status
On branch master

Initial commit

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)

        new file:   readme.txt
        new file:   user git/status.jpg

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   readme.txt

$ git commit -m "append"
[master (root-commit) 1e57831] append
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 readme.txt
 create mode 100644 user git/status.jpg

$ git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        readme.txt

nothing added to commit but untracked files present (use "git add" to track)

$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   readme.txt

jk@jk-pc /cygdrive/e/learn/git/img
$ git status
On branch master
nothing to commit, working tree clean

$ git log
commit 1e5783173a17ea5fc2cd9849cfa74214ef2da4e8
Author: name <[email protected]>
Date:   Mon Mar 27 04:57:05 2017 +0100

    append 

$ git reset --hard 1e5783173a17ea5fc2cd9849cfa74214ef2da4e8

$ git checkout -- readme.txt

$ git rm readme.txt

$ mkdir repo
$ cd repo
$ git init
$ touch readme.txt
$ git add readme.txt
$ git commit -m "test"

$ git remote add origin [email protected]:jkhhuse/repo.git

$ git push -u origin master

$ git clone [email protected]:jkhhuse/repo.git

$ git checkout -b dev
#相当于
$ git branch dev #创建分支
$ git checkout dev #切换到dev分支

$ git branch
* dev
  master

$ git checkout master
$ git merge dev

$ git branch -d dev

$ git branch

$ git pull

git diff <source_branch> <target_branch>

$ git merge feature1
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1

$ git log --graph --pretty=oneline --abbrev-commit
*   59bc1cb conflict fixed
|\
| * 75a857c AND simple
* | 400b400 & simple
|/
* fec145a branch test

$ git branch
$ git checkout master

$ git tag v1.0

$ git tag

$ git log --pretty=oneline --abbrev-commit
$ git tag v0.9 id前10个字符

$ git tag -a v0.1 -m "version 0.1 released" 3628164

$ git tag -d v0.1

git push origin v1.0

$ git push origin --tags

$ git tag -d v1.0
$ git push origin :refs/tags/v1.0