summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-25 04:35:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-25 04:35:29 (GMT)
commit18bece43675ea0dc9022a7868865e02808b7af7f (patch)
tree1d22ccd8b1bd5cac8e1bbc4c31c72f21b66c2cb6 /git-merge.sh
parent56752391a8c0c591853b276e4fa0b45c34ced181 (diff)
parent6d9d26d82623b8189fa88ebb7b47e45f8ccbb3b1 (diff)
downloadgit-18bece43675ea0dc9022a7868865e02808b7af7f.zip
git-18bece43675ea0dc9022a7868865e02808b7af7f.tar.gz
git-18bece43675ea0dc9022a7868865e02808b7af7f.tar.bz2
Merge branch 'maint'
* maint: fix memory leak in parse_object when check_sha1_signature fails name-rev: tolerate clock skew in committer dates Update bash completion for git-config options Teach bash completion about recent log long options Teach bash completion about 'git remote update' Update bash completion header documentation Remove a duplicate --not option in bash completion Teach bash completion about git-shortlog Hide the plumbing diff-{files,index,tree} from bash completion Update bash completion to ignore some more plumbing commands
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions