summaryrefslogtreecommitdiffstats
path: root/git-external-diff-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-30 09:58:28 +0200
committerJunio C Hamano <junkio@cox.net>2005-07-31 20:58:49 +0200
commit5da5c8f4cf4fb4e1cbccca4e7cebe70b77cf0b00 (patch)
tree329b5863cdb047fec0633d13bebfdfeb19c21a69 /git-external-diff-script
parentAdd a stupid "count objects" script. (diff)
downloadgit-5da5c8f4cf4fb4e1cbccca4e7cebe70b77cf0b00.tar.xz
git-5da5c8f4cf4fb4e1cbccca4e7cebe70b77cf0b00.zip
Teach parse_commit_buffer about grafting.
Introduce a new file $GIT_DIR/info/grafts (or $GIT_GRAFT_FILE) which is a list of "fake commit parent records". Each line of this file is a commit ID, followed by parent commit IDs, all 40-byte hex SHA1 separated by a single SP in between. The records override the parent information we would normally read from the commit objects, allowing both adding "fake" parents (i.e. grafting), and pretending as if a commit is not a child of some of its real parents (i.e. cauterizing). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-external-diff-script')
0 files changed, 0 insertions, 0 deletions