Lets try take an example and understand:

I have a branch say master pointing to X and I have a new branch pointing to Y .

Where Y = branch commits - few commits

Now say for Y branch I have to gap close the commits between master branch and new branch. Below is the procedure we can follow:

Step 1:

git checkout -b local origin/new 

where local is branch name. Any name can be given.

Step 2:

 git merge origin/master --no-ff --stat -v --log=300 

Merge the commits from master branch to new branch and also create a merge commit of log message with one-line descriptions from at most actual commits that are being merged.

For more information and parameters about git merge, please refer

git merge --help 

Also if you need to merge a specific commit, then you can use:

git cherry-pick <commit-id> 

Let's try to take an example and understand:

I have a branch, say master, pointing to X <commit-id>, and I have a new branch pointing to Y <sha1>.

Where Y <commit-id> = <master> branch commits - few commits

Now say for Y branch I have to gap-close the commits between the master branch and the new branch. Below is the procedure we can follow:

Step 1:

git checkout -b local origin/new 

where local is the branch name. Any name can be given.

Step 2:

 git merge origin/master --no-ff --stat -v --log=300 

Merge the commits from master branch to new branch and also create a merge commit of log message with one-line descriptions from at most <n> actual commits that are being merged.

For more information and parameters about Git merge, please refer to:

git merge --help 

Also if you need to merge a specific commit, then you can use:

git cherry-pick <commit-id> 

Lets try take an example and understand:

I have a branch say master pointing to X and I have a new branch pointing to Y .

Where Y = branch commits - few commits

Now say for Y branch I have to gap close the commits between master branch and new branch. Below is the procedure we can follow:

Step 1:

git checkout -b local origin/new 

where local is branch name. Any name can be given.

Step 2:

 git merge origin/master --no-ff --stat -v --log=300 

Merge the commits from master branch to new branch and also create a merge commit of log message with one-line descriptions from at most actual commits that are being merged.

For more information and parameters about git merge, please refer

git merge --help 

Lets try take an example and understand:

I have a branch say master pointing to X and I have a new branch pointing to Y .

Where Y = branch commits - few commits

Now say for Y branch I have to gap close the commits between master branch and new branch. Below is the procedure we can follow:

Step 1:

git checkout -b local origin/new 

where local is branch name. Any name can be given.

Step 2:

 git merge origin/master --no-ff --stat -v --log=300 

Merge the commits from master branch to new branch and also create a merge commit of log message with one-line descriptions from at most actual commits that are being merged.

For more information and parameters about git merge, please refer

git merge --help 

Also if you need to merge a specific commit, then you can use:

git cherry-pick <commit-id>