summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-06-02 12:05:08 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-06-02 12:05:08 -0700
commit86eff8c512b96ce3ee0ae5818edfa035b98cdf08 (patch)
tree0d562bf2e10356ca6b085787dd726c430e680436 /merge-recursive.c
parentFix git-am(1) synopsis formatting (diff)
parentUse =20 when rfc2047 encoding spaces. (diff)
downloadtgif-86eff8c512b96ce3ee0ae5818edfa035b98cdf08.tar.xz
Merge branch 'maint'
* maint: Use =20 when rfc2047 encoding spaces. Create a new manpage for the gitignore format, and reference it elsewhere Documentation: robustify asciidoc GIT_VERSION replacement
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions