]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41aaccd f3f8af0)
Merge branch 'vv/help-unknown-ref'
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:54:06 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:54:06 +0000 (15:54 -0700)
Detect "git merge foo" that might have meant "git merge origin/foo"
and give an error message that is more specific than "foo is not
something we can merge".

* vv/help-unknown-ref:
  merge: use help_unknown_ref()
  help: add help_unknown_ref()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.