diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:36:04 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:36:04 -0700 |
commit | 6ffd781226f04629eff63a684b47ad7555143312 (patch) | |
tree | e41ea02c886afd117f51b257d57f84043e447efd /t | |
parent | 19a7fcbf16276321f83e0c1748b3935a2ea42675 (diff) | |
parent | 2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (diff) | |
download | git-6ffd781226f04629eff63a684b47ad7555143312.tar.gz git-6ffd781226f04629eff63a684b47ad7555143312.tar.xz |
Merge branch 'maint'
* maint:
push: point to 'git pull' and 'git push --force' in case of non-fast forward
Documentation: add: <filepattern>... is optional
Change mentions of "git programs" to "git commands"
Documentation: merge: one <remote> is required
help.c: give correct structure's size to memset()
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions