summaryrefslogtreecommitdiff
path: root/gitk-git/gitk
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-07 01:06:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-07 01:06:39 (GMT)
commit5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243 (patch)
tree5107bf451c6e1dd9ce2e55bf0f947047c36d9510 /gitk-git/gitk
parent4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e (diff)
parent95b6a2db25c6c3321be33ac17b6b2e54c407652d (diff)
parent77aa0ae8d3599b905ceb25db8cc50d6820efb793 (diff)
downloadgit-5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243.zip
git-5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243.tar.gz
git-5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243.tar.bz2
Merge updated git-gui and gitk that call each other
Merge git://repo.or.cz/git-gui and git://git.kernel.org/pub/scm/gitk/gitk * git://repo.or.cz/git-gui: git-gui: Show special diffs for complex conflict cases. git-gui: Make F5 reselect a diff, if an untracked file is selected. git-gui: Reimplement and enhance auto-selection of diffs. git-gui: Support conflict states _U & UT. git-gui: Support more merge tools. git-gui: Don't allow staging files with conflicts. git-gui: Support calling merge tools. git-gui: Support resolving conflicts via the diff context menu. git-gui: Mark forgotten strings for translation. git-gui: Allow specifying an initial line for git gui blame. git-gui: Better positioning in Blame Parent Commit git-gui: Support passing blame to a parent commit. git-gui: Support starting gitk from Gui Blame git-gui: Teach git gui about file type changes * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add menu item for calling git gui blame gitk: Add option to specify the default commit on command line