summaryrefslogtreecommitdiff
path: root/t/t3500-cherry.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-12 21:52:19 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-12 21:52:19 -0800
commit8042ed1cebd37419ff38f540482355c0f1d30936 (patch)
tree8cc29ba2b6f5eac2d46f5222e8ff1dc1e7f6a7bd /t/t3500-cherry.sh
parentGet rid of the dependency on RCS' merge program (diff)
parentgit-svn: correctly handle packed-refs in refs/remotes/ (diff)
downloadtgif-8042ed1cebd37419ff38f540482355c0f1d30936.tar.xz
Merge branch 'master' into js/merge
* master: (42 commits) git-svn: correctly handle packed-refs in refs/remotes/ add test case for recursive merge git-svn: correctly display fatal() error messages git-svn: allow dcommit to take an alternate head git-svn: enable logging of information not supported by git Clarify fetch error for missing objects. Move Fink and Ports check to after config file shortlog: fix segfault on empty authorname shortlog: remove "[PATCH]" prefix from shortlog output Make sure the empty tree exists when needed in merge-recursive. Don't use memcpy when source and dest. buffers may overlap no need to install manpages as executable Documentation: simpler shared repository creation shortlog: fix segfault on empty authorname Add branch.*.merge warning and documentation update Fix perl/ build. git-svn: use do_switch for --follow-parent if the SVN library supports it Fix documentation copy&paste typo git-svn: extra error check to ensure we open a file correctly Documentation: update git-clone man page with new behavior ...
Diffstat (limited to 't/t3500-cherry.sh')
0 files changed, 0 insertions, 0 deletions