Skip to content

Latest commit

 

History

History
176 lines (135 loc) · 5.76 KB

SANDBOX.md

File metadata and controls

176 lines (135 loc) · 5.76 KB

Google Workflow

Trunk-based development

  • Monolithic codebase model
  • Central repository
  • Trunk based development
  • Single consistent view of the codebase
  • Avoids complexity of merging branches
  • Release branches
  • Bug fixes developed on mainline
  • Both new and old code paths commonly exist simultaneously controlled through the use of conditional flags.

Google workflow

  • Automated testing and recovery
  • Review code before commit
  • The Google codebase is laid out in a tree structure.
  • Each and every directory has a set of owners who control whether a change to files in their directory will be accepted. Owners are
  • Code reviewers comment on aspects of code quality
  • Code quality: design, functionality, complexity, testing, naming, comment quality, and code style
  • Static analysis system
  • Code-cleanup on regular basis

Git Commands

$ git init --bare --shared=all test.git
$ git init
$ echo 123 > test.txt
$ git add  *
$ git commit -m 'First commit'
$ git remote add origin ./test.git
$ git remote add upstreadm ./test.git
$ git push origin master

1. Create a new repository

No objects, no refs/heads, no logs

2. Add a new file to the index

Each change and add will generate a bloc object git ls-files --stage

3. Commit new file

The commit will create a commit object and a tree object. The refs/heads will be initialized

git log git cat-file -p

4. Amend the commit

A new commit object is created and the main branch points now to this new commit. The old commit object is not deleted

5. Detach HEAD and move around

Use checkout to move HEAD to any commit desired, detached HEAD. Use switch to restore HEAD to point to a branch.

Git Objets

1. Get the 5 last logs

$ git log -5 --oneline 
a6cc877 (HEAD -> master) [#####] - Name refactoring of some assets;
d5d064a (origin/master, origin/HEAD) [#####] - Cheat sheet added to assets;
269a11d [#####] - New asset;
4b760d2 [#####] - Git branching model;
d80d7b0 Initial commit

2. Get the long hash

$ git rev-parse a6cc877
a6cc8772b152ab7c2e40fd87dc944eab3ffb1e7d

3. Got to the .git directory and show content with dir

$ cd .git
$ dir
Mode                 LastWriteTime         Length Name
d-----      8.12.2021 г.     10:50                hooks
d-----      8.12.2021 г.     10:50                info
d-----      8.12.2021 г.     10:50                logs
d-----      8.12.2021 г.     14:41                objects
d-----      8.12.2021 г.     10:50                refs

4. Show the commit object using the hash

The first two digits are the directory, last digits the compressed file.

$ cd objects
$ dir
Mode                 LastWriteTime         Length Name
----                 -------------         ------ ----
d-----      8.12.2021 г.     12:00                26
d-----      8.12.2021 г.     10:52                33
d-----      8.12.2021 г.     10:53                39
d-----      8.12.2021 г.     13:55                3b
d-----      8.12.2021 г.     10:50                info
d-----      8.12.2021 г.     10:50                pack

$ cd a6 
$ dir

Mode                 LastWriteTime         Length Name
----                 -------------         ------ ----
-ar---      8.12.2021 г.     13:55            181 cc8772b152ab7c2e40fd87dc944eab3ffb1e7d

5. Decompress the commit object using the short or long hash

$ git cat-file -p a6cc877
tree 3b9ab3a0ee2124dd51d91161ab18c284c279c927
parent d5d064a947ac9df07ed2113768f6ae894e102c0f
author braboj <[email protected]> 1638964501 +0200
committer braboj <[email protected]> 1638964501 +0200

Migrate to another remote repository

https://rushabhshah065.medium.com/lets-move-repository-from-bitbucket-to-github-with-all-branches-and-commits-f93c7d3bda67

Push to several remote repositories

https://jigarius.com/blog/multiple-git-remote-repositories#:~:text=Register%202nd%20push%20URL,with%20git%20fetch%20%2D%2Dall%20. https://gist.github.com/rvl/c3f156e117e22a25f242

git remote set-url --add --push origin "httos://github.com/braboj/git-tutorial.git"
git remote set-url --add --push origin "https://gitlab.com/braboj/git-tutorial.git"

Alias

PS> git config --global alias.<alias> <command>
PS> git config --global alias.unstage 'reset --HEAD --'

Editor

PS> git config --global core.editor <editor + options>

git subtree

Performs a full copy of the target including files and history. The result is a transparent view of the local project with its dependencies as if it is one single project.

Syntax

git subtree [<options>] -P <prefix> add <local-commit>
git subtree [<options>] -P <prefix> add <repository> <remote-ref>
git subtree [<options>] -P <prefix> merge <local-commit>
git subtree [<options>] -P <prefix> split [<local-commit>]
git subtree [<options>] -P <prefix> pull <repository> <remote-ref>
git subtree [<options>] -P <prefix> push <repository> <refspec>

# Legend
-------------------------------------------------------------------------------
[]  : Optional
<>  : Replace
|   : OR
  
# Options
-------------------------------------------------------------------------------
-q, --quiet  : Suppress unnecessary output messages on stderr.
-d, --debug  : Produce even more unnecessary output messages on stderr.
-P, --prefix : Specify the path in the repository to the subtree

Examples

$ git status --short
$ git status --short --branch
$ git status --short --untracked --ignored