aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-23 22:24:01 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-23 22:24:01 -0800
commit783cfafb91538c178d78a9f6c7b609e4f06582f8 (patch)
tree242cb4414ba31ea251d701c8ebdf25f01ce3f4f8 /builtin-merge-recursive.c
parent75a7ea258c0644b79e57cab3a345807f4017dfd2 (diff)
parent0de8b94720501e869a05c52a691985fa4ce69803 (diff)
downloadgit-783cfafb91538c178d78a9f6c7b609e4f06582f8.tar.gz
git-783cfafb91538c178d78a9f6c7b609e4f06582f8.tar.xz
Merge branch 'cc/replace'
* cc/replace: Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS Documentation: fix typos and spelling in replace documentation replace: use a GIT_NO_REPLACE_OBJECTS env variable
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions