Skip to main content

git File Lifecycle

Move between:

working dir <-> staging <-> repo

git Tracking Statuses​

Untracked​

new file in working directory. when using it will move the file to staging area:

git add $file

A file that was staged could be moved back here after using:

git rm $file

Modified​

edited file. can move it to staging using

git add $file

Staged​

file in staging, got here after:

git add $file

Unmodified​

happens after

git commit

Git File Lifecycle​

lifecycle

echo \"third file\" >> file3.txt
# move file from untracked to staged

git add file3.txt

# check staging
git ls-files -s
100644 b7aec520dec0a7516c18eb4c68b64ae1eb9b5a5e 0       file1.txt
100644 670a245535fe6316eb2316c1103b1a88bb519334 0       file2.txt
100644 667bb3858a056cc96e79c0c3b1edfb60135c2359 0       file3.txt

# unstage file but don't remove it from working dir

git rm --cached file3.txt
rm 'file3.txt'

# check staging
git ls-files -s
100644 b7aec520dec0a7516c18eb4c68b64ae1eb9b5a5e 0       file1.txt
100644 670a245535fe6316eb2316c1103b1a88bb519334 0       file2.txt

# read file
git add file3.txt

# check staging
git ls-files -s
100644 b7aec520dec0a7516c18eb4c68b64ae1eb9b5a5e 0       file1.txt
100644 670a245535fe6316eb2316c1103b1a88bb519334 0       file2.txt
100644 667bb3858a056cc96e79c0c3b1edfb60135c2359 0       file3.txt

# go to unmodified
git commit -m "second commit"
[master 4e7b9a4] second commit
1 file changed, 1 insertion(+)
create mode 100644 file3.txt

Find Changes between Tags​

Find the two tags with regex:

cd ~/kbbgl/dev/github.com/kbbgl.github.io && (git tag -l "*1.00*"; git tag -l "*1.01*"; git tag -l "v1.00*"; git tag -l "v1.01*") | sed -e 's/^/TAG: /' | head -n 200

TAG: v1.00.0-app
TAG: v1.01.0-serverless-app
TAG: v1.01.0-app
TAG: v1.01.0-base-app
TAG: v1.00.0-app
TAG: v1.01.0-serverless-app
TAG: v1.01.0-app
TAG: v1.01.0-base-app

Find their commit:

cd ~/kbbgl/dev/github.com/kbbgl.github.io && git rev-parse v1.00.0-app v1.01.0-app

6c603217abbc93dc0e592ac3b32750588c917a03
8528a43c854d174ebefba24087175a8b8349c2e3

Find the amount of changed files between those two commits and list the first 3:

cd ~/kbbgl/dev/github.com/kbbgl.github.io && git diff --name-only v1.00.0-app..v1.01.0-app -- go/src/app go/src/infra go/src/infra go/src/sdk | wc -l && git diff --name-only v1.00.0-app..v1.01.0-app -- go/src/app go/src/infra go/src/infra go/src/sdk | head -3
     736
go/src/app/README.md
go/src/app/common/module.go
go/src/app/config/config.go