Geek asks and answers

Slashes of forgetting the slash in "git merge start / branch"

Per in this article , I tried to get used to the habit of fetching and merging explicitly when updating my working copy. However, today I made a typo when issuing the command:

$ git fetch origin
$ git merge origin asdf

Note that I used a space instead of a slash in the merge command. Since it seemed to have the desired effect anyway, I didn't notice until I already pushed that I added the added weird commit to the log:

commit 65f0037bed926c338cb95e7437e7f7f407028d9f
Author: Me <my_email@example.com>
Date:   Mon May 14 09:36:44 2012 -0700

    Merge branch 'asdf', remote-tracking branch 'origin' into asdf

Now I am wondering if this had really negative side effects. It seems that he considered the arguments as two separate industry specifications in order to merge into the current branch, and that the “origin” implicitly expanded to “origin / asdf” - which I assumed. At this moment, I have no idea why he even allowed Merge asdf to asdf.

Was it just embarrassing no-op? Or did I introduce a potentially problematic construct in the history of my repository?

EDIT: output git cat-file commit 65f0037b

tree 74ed9ead4b82e4e56bd5656ee10375f8f0fcb60d
parent 3bc2a37031a4a391aa4da64c22e3f55148cd23e2
author Me <my_email@example.com> 1337013404 -0700
committer Me <my_email@example.com> 1337013404 -0700

    Merge branch 'asdf', remote-tracking branch 'origin' into asdf
+3
source share
1 answer

Start with the command man page merge:

   git merge [-n] [--stat] [--no-commit] [--squash]
           [-s <strategy>] [-X <strategy-option>]
           [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]

So, in the absence of all parameters, it mergeaccepts a list of commits. If you are already in a branch asdfand you enter:

git merge asdf

... -op: , . :

git merge origin

git , origin. branch -a:

* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

remotes/origin/HEAD , :

git merge origin

:

git merge origin/master

, master, :

git merge origin asdf

:

git merge origin/master

asdf, :

git merge origin/asdf
+4

More articles:


All Articles