How to avoid merge commits using TortoiseGit

git tortoisegit
Hareen Laks picture Hareen Laks · Apr 26, 2013 · Viewed 14.5k times · Source

The problem is when I'm pull and push to the remote repository, it generates a extra commit under my name. The commit says

Merge branch 'master' of ssh://....

I found answers says I should use a command git pull --rebase in git bash to avoid this commit.

But I'm commonly using TortoiseGit. So how can I do it properly with TortoiseGit?

Answer

enorl76 picture enorl76 · Dec 11, 2013

This is an option since version 1.8 of Tortoise Git. The rebase option can be invoked from a the Fetch command:

TortoiseGit fetch dialog highlighting Launch-Rebase-After-Fetch checkbox

Related questions

How to resolve "git did not exit cleanly (exit code 128)" error on TortoiseGit?

I've run into this serious error while committing, and created a bug report. I keep getting this error on TortoiseGit operations: git did not exit cleanly (exit code 128) I've reinstalled the program, rebooted, and tried to clone a fresh repo …

Read More
Git error: "Please make sure you have the correct access rights and the repository exists"

I am using TortoiseGit on Windows. When I am trying to Clone from the context menu of the standard Windows Explorer, I get this error: Please make sure you have the correct access rights and the repository exists More precisely, …

Read More
TortoiseGit save user authentication / credentials

Is there a way to save GITHUB's user credentials with TortoiseGit? It prompts me the below dialog every time whenever I do a push/pull. I would like to save my user credential information somewhere like how I did with …

Read More