summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-31 10:42:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-31 22:41:12 (GMT)
commitc1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246 (patch)
tree1e328dc91018d6d3a729728be8925b1b037524eb /.gitignore
parent7a85b848ad77c72c539c5887ead99a89140541da (diff)
downloadgit-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.zip
git-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.tar.gz
git-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.tar.bz2
merge-recur: virtual commits shall never be parsed
It would not make sense to parse a virtual commit, therefore set the "parsed" flag to 1. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions