diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-29 00:27:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-29 00:27:24 -0700 |
| commit | 79d5576a4f2eada820802d2e7e19226e54f9de5d (patch) | |
| tree | 1368eb21d31f3bda4823385f98656b9566e0924c /Documentation/merge-options.txt | |
| parent | cvsserver: Handle 'cvs login' (diff) | |
| parent | cvsserver: Fix some typos in asciidoc documentation (diff) | |
| download | tgif-79d5576a4f2eada820802d2e7e19226e54f9de5d.tar.xz | |
Merge branch 'maint'
* maint:
cvsserver: Fix some typos in asciidoc documentation
cvsserver: Note that CVS_SERVER can also be specified as method variable
cvsserver: Correct inetd.conf example in asciidoc documentation
user-manual: fixed typo in example
Add test case for $Id$ expanded in the repository
git-svn: avoid md5 calculation entirely if SVN doesn't provide one
Makefile: Remove git-fsck and git-verify-pack from PROGRAMS
Fix stupid typo in lookup_tag()
git-gui: Guess our share/git-gui/lib path at runtime if possible
Correct key bindings to Control-<foo>
git-gui: Tighten internal pattern match for lib/ directory
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions