Andrew's git / gitweb.git / diff
?
Merge branch 'pt/pull-builtin' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:32 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:32 +0000 (14:32 -0700)
* pt/pull-builtin:
pull: enclose <options> in brackets in the usage string
merge: grammofix in please-commit-before-merge message

1  2 
builtin/pull.c patch | diff1 | diff2 | blob | history
contrib/examples/git-pull.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/pull.c
Simple merge
diff --cc contrib/examples/git-pull.sh
Simple merge