diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-10 22:07:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 22:07:26 -0800 |
| commit | ed287ab7fa71528e8de288988d1662eebae64002 (patch) | |
| tree | fa8ab5768bfce68c5923b674c13d514942a3954c /builtin-merge-file.c | |
| parent | Merge branch 'js/config-rename' (diff) | |
| parent | git.el: Retrieve commit log information from .dotest directory. (diff) | |
| download | tgif-ed287ab7fa71528e8de288988d1662eebae64002.tar.xz | |
Merge branch 'maint'
* maint:
git.el: Retrieve commit log information from .dotest directory.
git.el: Avoid appending a signoff line that is already present.
setup_git_directory_gently: fix off-by-one error
user-manual: install user manual stylesheet with other web documents
user-manual: fix rendering of history diagrams
user-manual: fix missing colon in git-show example
user-manual: fix inconsistent use of pull and merge
user-manual: fix inconsistent example
glossary: fix overoptimistic automatic linking of defined terms
Documentation: s/seperator/separator/
Adjust reflog filemode in shared repository
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions