Philip Oakley <philipoakley@iee.email> writes: > Isn't this meant to be something similar to the --no-merge option for > checkout. That is: I am where I am, but really I want this to be on > branch X. Or is the --no-merge option meant to be something else? Is there a --no-merge option to "git checkout"? I know the reason why I invented "git checkout --merge" was because I wanted the command to carry more changes in the working tree than the default behaviour would while checking out another branch, but I do not think I added an option to do less, i.e. forbid it from carrying any change in the working tree while checking out another branch.