projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eddb5bc 8fee872)
Merge branch 'jk/complete-merge-pull' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:35:53 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:35:53 +0000 (13:35 -0700)
commitd1524c57f2b39b5543dd90c1bd7f10a96eda91e4
tree9a942a80bbabdd61ea17f92c11166df604e83aa3tree | snapshot
parenteddb5bc9d2cf82930941b63f69b9e210bcbaeb9acommit | diff
parent8fee8726470bd63db6c396ea6208ea487eaa8fabcommit | diff
Merge branch 'jk/complete-merge-pull' into next

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.