summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-06 20:31:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-06 20:31:38 (GMT)
commit65ac5530abcc3699ebc27126d8389f35baa8cafe (patch)
tree0d720a30873bd3bd88866647c80ffe8a237d488e /merge-tree.c
parentddd63e64e4ac7e455dff3e807bf6a6977bb61456 (diff)
parent4fac1d3a98bb86d855b706d7ce6a5069b9f687e8 (diff)
downloadgit-65ac5530abcc3699ebc27126d8389f35baa8cafe.zip
git-65ac5530abcc3699ebc27126d8389f35baa8cafe.tar.gz
git-65ac5530abcc3699ebc27126d8389f35baa8cafe.tar.bz2
Merge branch 'rs/archive-parse-options'
* rs/archive-parse-options: archive: allow --exec and --remote without equal sign
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions