Git commands

 

diff -u FILE1 FILE2 show the different between files in unified detail format (Only in Linux) diff -u FILE1 FILE2 > NEWFILE.diff new file will have the different between File1 and File2 patch FILE1 < FILE2.diff patch the diff file to the File1 git config --global user.name "NAME" git congig --global user.email "EMAIL" git config -l git init git clone URL git add FILENAME Staging the file git add * Staging all file git commit -m MESSAGE Commiting the message git commit -a -m MESSAGE Both staging and commiting only for non new file git status give status git log Show all log for all commit git log -p Show with patch git show COMMITID Show log detail of given commitid git log --stat Show log details with some file changes git diff Show diff of the file changes (equal like diff -u) and applicable for unstaged changes git add -p Show the changes and ask whether to commit or not git diff --staged Show the chnages but not commited git rm FILE remove the file from git directory git mv OLDFILE NEWFILE move the file git checkout FILE revert where the file before stage git reset HEAD FILENAME revert where the file after stage but not commited git commit --amend append git last commit message with new message (Applicable for local Git) git revert HEAD revert back to last changes with new commitid git revert COMMITID revert back to specified commit git branch show all the branch in current repository git branch BRANCHNAME create a new branch git checkout BRANCHNAME shift to that branch git checkout -b BRANCHNAME create and shift to that branch git branch -d BRANCHNAME delete the branch (Applicabel for no file in that branch) git branch -D BRANCHNAME delete the branch forcefully (Even have file and not merge with master) git merge BRANCHNAME merge the BRANCHNAME to current branch Trivia: Merge are two ways 1.Fast-forward o CommitID of side branch o CommitID of side branch / | o CommitID of master -----> o CommitID of master | | o CommitID of master o CommitID of master | | o CommitID of master o CommitID of master 2. Three ways merge o CommitID of master |\ | o CommitID of side branch |/ o CommitID of master | o CommitID of master git log --graph --oneline show the log in graph format with one line detail git merge --abort abort the merge process git push push the code to remote git remote -v show the origin of the remote repository git remote show origin information about origin branch git branch -r show the remote branch which is tracking to fetch and push git fetch download the code from remote but not update in local git merge origin/master merge the code with local where it is fetched git pull doanload and merge automatically in local if no conflict git log origin/master show log with both remote and local git checkout BRANCHNAME created the branch by fetching from remote and shift to that branch git push push the code to remote origin git push -u origin BRANCHNAME upstream the code to remote branch git rebase BRANCHNAME like merge, but will have fast forward commit instead of three ways commit Trivia 1. git merge o master |\ |o side branch1 |o side branch2 |o side branch3 |/ o master o master 2. git rebase o side branch1 o side branch2 o side branch3 o master o master git push --delete origin BRANCHNAME remove the branch in remote git rebase -i BRANCHNAME like merge, but will have fast forward commit instead of three ways commit. The interactive rebase process git push -f force to push in remote

Comments

Post a Comment

Popular posts from this blog

Easy Text-to-Speech with Python

Image
Text-to-speech (TTS) technology reads aloud digital text. It can take words on computers, smartphones, tablets and convert them into audio. Also, all kinds of text files can be read aloud, including Word, pages document, online web pages can be read aloud. TTS can help kids who struggle with reading. Many tools and apps are available to convert text into speech. Python comes with a lot of handy and easily accessible libraries and we’re going to look at how we can deliver text-to-speech with Python in this article. Source:  https://www.youtube.com/watch?v=eiP-12qHM-c Different API’s are available in Python in order to convert text to speech. One of Such API’s is the Google Text to Speech commonly known as the gTTS API. It is very easy to use the library which converts the text entered, into an audio file which can be saved as a mp3 file. It supports several languages and the speech can be delivered in any one of the two available audio speeds, fast or slow. More detai
Read more

Flutter for Single-Page Scrollable Websites with Navigator 2.0

Image
  Single page scrollable websites are everywhere. In this website design pattern, all the content is presented in one long-scrolling layout that contains multiple sections. Visitors can scroll or jump to a section by clicking buttons of a sticky menu. This pattern is a good fit for small content such as brochure websites, software library documentation, portfolios, and landing pages that are used to convert users [ 1 ]. Designers also love this pattern because it is simple, clean, and enables cool scroll animations. Jetbrains Mono single-page scrollable website Hive docs multi-page scrollable website In this series of articles, we will explore how to build a  single-page scrollable website  using Flutter. We will benefit from the Navigator 2.0 API to provide a good navigation experience to the users. You can find the source code of this series’ sample apps on my  Github page . The implementation details of the sample apps will be explained in the following articles: Part 2: Scroll to P
Read more

Better File Storage in Oracle Cloud

Image
Use Oracle Application Express with Oracle Cloud Infrastructure REST APIs to upload, download, and manage big files in Oracle Cloud. By Adrian Png November 27, 2019 Oracle Cloud Infrastructure  provides a comprehensive suite of REST APIs for accessing and managing cloud resources. For example, administrators can use REST APIs to create and manage autonomous databases and initiate backups. Oracle Application Express (Oracle APEX)  makes working with REST easy. The  APEX_WEB_SERVICE  package, available since Oracle APEX 4.0, provides developers with a function for consuming REST APIs. Oracle APEX 5.0 introduced the  APEX_JSON  package, allowing easy parsing of JSON responses. Oracle APEX 18.1 introduced the Web Source Module (WSM), which enables developers to access REST services and use the data in APEX components such as reports, interactive reports, and interactive grids. These features, when used together with Oracle Cloud Infrastructure REST APIs, enable APEX developers
Read more