]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a634a6d 8fee872)
Merge branch 'jk/complete-merge-pull'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:17:53 +0000 (12:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:17:53 +0000 (12:17 -0700)
commit5cf2c571d08f38b90887d41d5c03376714f0b00d
treeb4bd9d0b1363e854346168319d2445df32c3d5d5tree | snapshot
parenta634a6d209fc67ed8fb58925a6ae713b2a913a83commit | diff
parent8fee8726470bd63db6c396ea6208ea487eaa8fabcommit | diff
Merge branch 'jk/complete-merge-pull'

The completion code did not know about quite a few options that are
common between "git merge" and "git pull", and a couple of options
unique to "git merge".

* jk/complete-merge-pull:
  completion: add missing options for git-merge
  completion: add a note that merge options are shared
Unnamed repository; edit this file 'description' to name the repository.