summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-08-22 12:34:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-22 12:34:12 -0700
commit22e86e85cba1e2697aea46810238ef9b3c7401cf (patch)
tree9a2a806b4ed5e4e373c854e26df51497fc6b410e /userdiff.c
parentMerge branch 'jk/perf-no-dups' (diff)
parentgit-fast-import.txt: clarify that multiple merge commits are allowed (diff)
downloadtgif-22e86e85cba1e2697aea46810238ef9b3c7401cf.tar.xz
Merge branch 'en/fast-import-merge-doc'
Doc update. * en/fast-import-merge-doc: git-fast-import.txt: clarify that multiple merge commits are allowed
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions