Skip to main content

Git command handout

Rebase from master
$ gitk --simplify-by-decoration refload_1_0_1_0 refload_1_0_3_0 refload_1_0_2_0 refload_1_0_1_0

Get remote repositry
git remote -v

If needed  a copy of code to work in that (similar svn checkout)
clone:  git clone git@yourserver:repository/abc.git

if want to switch to create new branch of git ( first clone complete repository as above then checkout)
checkout:  git checkout -b abc_9_18_0_0
checkout:  git checkout  abc_9_18_0_0  (if want to checkout to existing git branch)

if want to add files to index
add:  git add -A   (for adding all files)

want to check status of repository ( if any non traced file is  present)
status : git status -s

want to commit 
commitgit commit -m 'message for commit for tracking purpose'

want to push code to branch
push: git push origin abc_9_18_0_0  (don't put semicolon otherwise whole branch will get delete instead)

want to get updated code from existing repository
pull: git pull

want to see all branches (remote & local)
branch: git branch -a (all branches) or git branch --all
branchgit branch -r  (only remote branch)
branchgit branch --list   (to see all local branch with current branch as *)

want to delete any branch locally and remotely
checkout to master
checkout :git checkout master
delete local: git branch -d abc_9_18_0_0
delete remote: git push origin  :abc_9_18_0_0

want to check repository path
git remote show origin

Want to replace local with remote branch

Reset: git reset --hard origin/master
Assuming that "origin/master" is your remote branch you want to reset to. This updates your local HEAD branch to be the same revision as origin/master, and --hard will sync this change into the index and workspace as well.will remove modifciation present in local

amitg@VDC-SYN-DEV-10 ~/Workspaces/GGTSWorkspace/refload_api (moms_7_2_0_1)
git reset --hard origin/moms_7_2_0_1
fatal: Unable to create 'h:/Workspaces/GGTSWorkspace/refload_api/.git/index.lock': File exists.
$ rm --force ./.git/index.lock

Want to jusr unstage local changes just before comit without removing any chnagegit reset (inside that branch & not hard or any other argument)

Git sync local repositry and overrite remote repositrygit fetch --prune/ -p which deletes your local branch, if its corresponding remote branch is deleted

Abort Merging
git merge --abort

Remove untracked files and untracked directories from the current directory.
git clean -xfd --dry-run if okay then git clean -xfd

# Undo changes in tracked files
git reset --hard

Match local branch to remote barnch
git reset --hard origin/moms_7_2_0_0

create branch from another branch

1.Checkout or change into "branch1"

     git checkout branch1

  1. Now create your new branch called "subbranch_of_b1" under the "branch1" using the following command.
    checkout to branch deom which you want to create subbranch & then do below    
    git checkout -b subbranch_of_b1 branch1

Visulaize Git log tree
git log --oneline --abbrev-commit --all --graph --decorate --color




Merging and taging after release
------------------------------------

1.          git checkout master
2.          git pull origin master
3.          git merge mags_9_5_1_0--
4.          git push origin master
5.          git branch –d mags_9_5_1_0
6.          git push origin  :mags_9_5_1_0
7.          git tag –a “mags_9_5_1_0” –m “Release branch mags_9_5_1_0 merge with master”
8.          git push --tags
















Comments

Popular posts from this blog

Conversion from Clob To String in java and Vice versa

/***reading Clob data from oracle table and setting to Pojo**/
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;

import oracle.sql.CLOB;

import com.poc.one.pojo.StagedMessage;

public class MessageDao {
private static String url = "jdbc:oracle:thin:@172.22.22.198:1521:ORACLE";
private static String username = "ABC123";
private static String password = "ABC123";


public  List readClobToBO() throws Exception {

Class.forName("oracle.jdbc.driver.OracleDriver");
Connection conn = DriverManager.getConnection(url, username, password);
PreparedStatement stmt = conn
.prepareStatement("SELECT ID, STORE_ID, MESSAGE_DATA FROM STAGED_MESSAGE ");
ResultSet resultSet = stmt.executeQuery();
List msgList= new ArrayList();

while (resultSet.next()) {

StagedMessage message = new StagedMessage();

message.setId(resultSet.getInt(1));
message.setStoreId(r…

Portable Java 8/ JDK8 setup without admin rights

Some time we got machine to work where we don't have access rights to install anything or if you do not want to install. You can get latest jdk running by this trick. Just follow step step & do comment if you like it.

Step by Step details to get running java from .exe setup without any admin rights. Get portable 7 zip from portableapps.comdownload java 8 from oracle  http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.htmlopen 7 zip & extract jdk-8u102-windows-x64.exeyou will see below folders                .data                .pdata                .rdata                .reloc                .rsrc                .text                CERTIFICATE

          5.Go inside E:\jdk-8u102-windows-x64\.rsrc\1033\JAVA_CAB10you will find 111 file.

         6.extract it it some folder where you can find tools.zip again extract that to some folder say Java & copy it to very first folder of setup along with .data,.rsrc etc.
         7.Go to folder where you have co…

Multi Threading , Producer consumer problem in Java

Multi threading is topic which is always fascinating for java developer. I feel its more about practical the theory. So here i wanted to present sample examples which clear understanding for several multi threading concept.

In Theory basically thread which is light weight process.Thread shares mostly same memory space.
I said mostly because there is some space called thread local which is not common to threads & separate for each thread. We create thread whenever we wanted to use multicore of processor although that doesn't mean single core cant use it. In single core context switching works among different running thread.

for example suppose there is website which is showing latest price as well as offer as well as doing order booking all these things can be assigned to different thread to provide parallel processing.



There are 2 ways for creating a thread.

Extend a thread & Implement a Runnable class. Extending a class is little avoided since it closed possibility for e…