![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Aug 2009 23:36:04 +0000 (16:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Aug 2009 23:36:04 +0000 (16:36 -0700) | ||
| commit | 6ffd781226f04629eff63a684b47ad7555143312 | |
| tree | e41ea02c886afd117f51b257d57f84043e447efd | tree | snapshot |
| parent | 19a7fcbf16276321f83e0c1748b3935a2ea42675 | commit | diff |
| parent | 2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe | commit | diff |
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()
* 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()
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-rev-list.txt | diff1 | | diff2 | | blob | history |
| builtin-push.c | diff1 | | diff2 | | blob | history |
| transport.c | diff1 | | diff2 | | blob | history |
| transport.h | diff1 | | diff2 | | blob | history |