summaryrefslogtreecommitdiff
path: root/git-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 18:32:45 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 18:32:45 -0700
commite7afa1115beb071512ac2b8d6b7487eadbfccc74 (patch)
treee1473acf5c9da91c36ab64d8c941fe7bd632090e /git-resolve.sh
parentMerge branch 'master' into jc/cache-tree (diff)
parentt0000-basic: more commit-tree tests. (diff)
downloadtgif-e7afa1115beb071512ac2b8d6b7487eadbfccc74.tar.xz
Merge branch 'master' into jc/cache-tree
* master: t0000-basic: more commit-tree tests. commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
Diffstat (limited to 'git-resolve.sh')
0 files changed, 0 insertions, 0 deletions