Question

I fetched from an arbitrary repo (not tracked in .git/config). After the fetch, nothing new appears in git log or gitk. How do I merge after my pull?

/home/alice $ touch b && git add b && git commit -m "Added b"
[master dd8d3ba] Added b
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 b

/home/alice $ cd ../bob
/home/bob $ git fetch ../alice/
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (2/2), done.
From ../alice
 * branch            HEAD       -> FETCH_HEAD

/home/bob $ ... now what?

What arguments do I pass to git merge ?

Answer 1

Have you tried git merge FETCH_HEAD?

git merge accepts any revision specification as its argument, so you could write for example SHA1 hash there, somebranch~5, or many other variations.

FETCH_HEAD references the commit that was fetched last.