block-beta columns 1 block:notes space:2 f["option to show all commits"] space end block:command a("git") b("log") c("--all") d("--grep='word'") end block:notes2 space g["command to \nshow the history"] space h["option to pass the \nsearch term to be found"] end block:info j["this command also performs textual search using regex"] end %% arrows %% b --> g c --> f classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:2em; d --> h %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,d,e,f,g,h,i,j,k,l,notes,notes2,command,info transparent classDef commandFont font-family:'Borel', font-size:1.6em, line-height:2.2em; class a,b,c,d,e,k commandFont class f,g,h,i,j,l textFont

block-beta columns 1 block:notes space:2 f["current file name"] space end block:command a("git") b("mv") c("source") d("target") end block:notes2 space g["command to\nmove files"] space h["new file name"] end block:info j["this command can be used to move files between folders"] end %% arrows %% b --> g c --> f classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:2em; d --> h %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,d,e,f,g,h,i,j,k,l,notes,notes2,command,info transparent classDef commandFont font-family:'Borel', font-size:1.6em, line-height:2.2em; class a,b,c,d,e,k commandFont class f,g,h,i,j,l textFont

block-beta columns 1 block:notes space:2 f["option to allow the\ncreation of an empty commit"] end block:command a("git") b("commit") c("--allow-empty") end block:notes2 space g["command to\nmanage commits"] space end block:info j["this command will open a text editor to write the commit message"] end %% arrows %% b --> g c --> f classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:2em; %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,d,e,f,g,h,i,j,k,l,notes,notes2,command,info transparent classDef commandFont font-family:'Borel', font-size:1.6em, line-height:2.2em; class a,b,c,d,e,k commandFont class f,g,h,i,j,l textFont

block-beta columns 1 block:notes space:2 f["repository from where\n to download changes"] space end block:command a("git") b("pull") c("remote") d("branch") end block:notes2 space g["command to \ndowload changes"] space h["branch to download\n changes from"] end block:info j["usually both the remote and the branch can be omitted"] end %% arrows %% b --> g c --> f classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:2em; d --> h %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,d,e,f,g,h,i,j,k,l,notes,notes2,command,info transparent classDef commandFont font-family:'Borel', font-size:1.6em, line-height:2.2em; class a,b,c,d,e,k commandFont class f,g,h,i,j,l textFont

block-beta columns 1 block:notes a["it happens when two or more changes are made to the\n same chunk of a file and git doesn't know\nhow to apply the most recent change"] end block:notes2 b["conflicts are indicated by the markers >>> === <<<"] end %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,notes,notes2,notes3,info transparent classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:1.4em; class a,b,c,notes,notes2,notes3,info textFont

block-beta columns 1 block:notes space:2 f["Flag to indicate \nthe new source"] space i["Incorrect branch source"] space end block:command a("git") b("rebase") c("--onto") d("source") e("previous") k("branch") end block:notes2 space g["Command to reapply commits"] space h["Branch or commit \nthat should be the source"] space l["Branch that \nneeds correction"] end %% arrows %% b --> g c --> f classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:2em; d --> h e --> i k --> l classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:2.2em; %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,d,e,f,g,h,i,j,k,l,notes,notes2,command,info transparent classDef commandFont font-family:'Borel', font-size:1.6em, line-height:2.2em; class a,b,c,d,e,k commandFont class f,g,h,i,j,l textFont

block-beta columns 1 block:notes a["It is the process of submitting changes for\nreview on GitHub"] end block:notes2 b["On GitLab, this process is called merge\nrequest"] end %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,notes,notes2,notes3,info transparent classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:1.4em; class a,b,c,notes,notes2,notes3,info textFont

block-beta columns 1 block:notes a["it's the commit setup area"] end block:notes2 b["where we see the collection of altered or created files \nthat will be part of the next commit"] end %% styling %% classDef transparent fill:#fff, stroke:#fff; class a,b,c,notes,notes2,notes3,info transparent classDef textFont font-family:'Chilanka', font-size:1.2em, font-color:#fff, line-height:1.4em; class a,b,c,notes,notes2,notes3,info textFont