5fc3e67ac0
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
|
||
|---|---|---|
| .. | ||
| about.tcl | ||
| blame.tcl | ||
| branch.tcl | ||
| branch_checkout.tcl | ||
| branch_create.tcl | ||
| branch_delete.tcl | ||
| branch_rename.tcl | ||
| browser.tcl | ||
| checkout_op.tcl | ||
| choose_font.tcl | ||
| choose_repository.tcl | ||
| choose_rev.tcl | ||
| class.tcl | ||
| commit.tcl | ||
| console.tcl | ||
| database.tcl | ||
| date.tcl | ||
| diff.tcl | ||
| encoding.tcl | ||
| error.tcl | ||
| git-gui.ico | ||
| index.tcl | ||
| logo.tcl | ||
| merge.tcl | ||
| mergetool.tcl | ||
| option.tcl | ||
| remote.tcl | ||
| remote_branch_delete.tcl | ||
| shortcut.tcl | ||
| spellcheck.tcl | ||
| status_bar.tcl | ||
| transport.tcl | ||
| win32.tcl | ||
| win32_shortcut.js | ||