| commit | ff7e96b78f3ad9db61fbdfdeaf7b71f254f76310 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:46:12 +0000 (25 11:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:46:12 +0000 (25 11:46 -0700) | ||
| tree | 5931ff763db1eefc6345a4ab54247095f595f2f7 | treesnapshot (tar.gz zip) |
| parent | fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6 | commitdiff |
| parent | 8fee8726470bd63db6c396ea6208ea487eaa8fab | commitdiff |
Merge branch 'jk/complete-merge-pull' into maint
The completion scripts (in contrib/) 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
The completion scripts (in contrib/) 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