summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-05-08 09:28:26 -0400
committerJunio C Hamano <junkio@cox.net>2007-05-08 22:47:17 -0700
commit842aaf93238377976111fc801aaacbf8a491db33 (patch)
treeb218051d53d0f0c6a1a862dd6a9b0092542fe155 /git-merge-ours.sh
parentabda5227770b39bb4abd8f0b4c1a0f69c2778300 (diff)
downloadgit-842aaf93238377976111fc801aaacbf8a491db33.tar.gz
Add pack.depth option to git-pack-objects.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions