summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 22:37:23 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-23 22:37:23 -0700
commit98ee8187e4e331716be0797169ba9ddbb26efe56 (patch)
treea4ee87b74fd3c6050e91537314c12c069929e5cc /git-mergetool.sh
parentgitweb.perl - Optionally send archives as .zip files (diff)
parentMerge branch 'maint' of git://repo.or.cz/git/fastimport into maint (diff)
downloadtgif-98ee8187e4e331716be0797169ba9ddbb26efe56.tar.xz
Merge branch 'maint'
* maint: Fix possible coredump with fast-import --import-marks Refactor fast-import branch creation from existing commit fast-import: Fix crash when referencing already existing objects fast-import: Fix uninitialized variable Documentation: fix git-config.xml generation
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions