diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-07 01:30:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 01:30:43 -0700 |
| commit | ced38ea252cb8b0315f4d2a54648b11c6c090657 (patch) | |
| tree | 0c398a6bf408bb47fafc65c918b24b1bafeed7b1 /t/t6023-merge-file.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | Documentation: tighten dependency for git.{html,txt} (diff) | |
| download | tgif-ced38ea252cb8b0315f4d2a54648b11c6c090657.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: tighten dependency for git.{html,txt}
Makefile: iconv() on Darwin has the old interface
t5300-pack-object.sh: portability issue using /usr/bin/stat
t3200-branch.sh: small language nit
usermanual.txt: some capitalization nits
Make builtin-branch.c handle the git config file
rename_ref(): only print a warning when config-file update fails
Distinguish branches by more than case in tests.
Avoid composing too long "References" header.
cvsimport: Improve formating consistency
cvsimport: Reorder options in documentation for better understanding
cvsimport: Improve usage error reporting
cvsimport: Improve documentation of CVSROOT and CVS module determination
cvsimport: sync usage lines with existing options
Conflicts:
Documentation/Makefile
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions