summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-11-02 00:15:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-02 00:15:22 -0700
commitaebd173ffa7a4e67447f0157a14abde7767c54e9 (patch)
tree2c3c660e441d93120a42cfac5c909dcbd2f5b275 /userdiff.c
parentMerge git://repo.or.cz/git-gui (diff)
parentStart 1.6.0.4 cycle (diff)
downloadtgif-aebd173ffa7a4e67447f0157a14abde7767c54e9.tar.xz
Merge branch 'maint'
* maint: Start 1.6.0.4 cycle add instructions on how to send patches to the mailing list with Gmail Documentation/gitattributes: Add subsection header for each attribute git send-email: avoid leaking directory file descriptors. send-pack: do not send out single-level refs such as refs/stash fix overlapping memcpy in normalize_absolute_path pack-objects: avoid reading uninitalized data correct cache_entry allocation Conflicts: RelNotes
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions