summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-02 22:04:34 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-02 22:04:34 -0700
commitfd9088a8c74a2d508ff50f53afbca93826603b30 (patch)
treeb8211a4c19ec1659f52612cac6cb6881ca9c41d2 /Documentation/technical/trivial-merge.txt
parentMerge branch 'jc/grep' into next (diff)
parentcore.prefersymlinkrefs: use symlinks for .git/HEAD (diff)
downloadtgif-fd9088a8c74a2d508ff50f53afbca93826603b30.tar.xz
Merge branch 'jc/symref' into next
* jc/symref: core.prefersymlinkrefs: use symlinks for .git/HEAD
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions