summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-07 16:06:45 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-07 16:06:45 -0700
commit7f498065e9bf85f6f3e954ec57dedf56fec29e01 (patch)
treed5bd668d03aaa23fcfc280c861a77b29a598d758 /xdiff-interface.c
parentMerge branch 'jc/cache-tree' into next (diff)
parentclone: don't clone the info/alternates file (diff)
downloadtgif-7f498065e9bf85f6f3e954ec57dedf56fec29e01.tar.xz
Merge branch 'mw/alternates' into next
* mw/alternates: clone: don't clone the info/alternates file test case for transitive info/alternates Transitively read alternatives repack: honor -d even when no new pack was created clone: keep --reference even with -l -s repo-config: document what value_regexp does a bit more clearly. Release config lock if the regex is invalid core-tutorial.txt: escape asterisk Sparse fix for builtin-diff Fix users of prefix_path() to free() only when necessary
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions