aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-09-25 09:09:41 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-09-25 09:09:41 -0700
commit81b84bcbe3cc6a29a62fb1a69c68764ad6c0feeb (patch)
tree34d4650de9c5aa37cf9a2d23688dfe99ff52fd76 /builtin-merge.c
parent58245a5e40e1f95976a4f0fd53c2e8d3a1c3c763 (diff)
parent6ecb1ee28a9479af1d39cfab170b5d93e238c277 (diff)
downloadgit-81b84bcbe3cc6a29a62fb1a69c68764ad6c0feeb.tar.gz
git-81b84bcbe3cc6a29a62fb1a69c68764ad6c0feeb.tar.xz
Merge branch 'jc/apply-include-exclude'
* jc/apply-include-exclude: git-apply:--include=pathspec
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions