summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-10-20 22:16:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-20 22:16:09 -0700
commit35d2f73b999636c93049b2d7bed1458bcf2f9648 (patch)
treec0ab3eb2060992aa91353fa456c9bfea4a8d9d1d /t/t6021-merge-criss-cross.sh
parentdocument "intent to add" option to git-add (diff)
parentgitk: Turn short SHA1 names into links too (diff)
downloadtgif-35d2f73b999636c93049b2d7bed1458bcf2f9648.tar.xz
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Turn short SHA1 names into links too gitk: Regenerate .po files gitk: New way of constructing menus that allows for Alt+letter accelerators gitk: Bind Key-Return to create on new branch dialog gitk: Fix binding for <Return> in sha1 entry field gitk: Clean up file encoding code and add enable/disable option gitk: Implement batch lookup and caching of encoding attrs gitk: Enhance file encoding support gitk: Add untranslated error messages to translation gitk: Fix a bug in collapsing deeply nested trees gitk: Use <Button-2> for context menus on OSX
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions