git/lib at 0aea2842d9d556afa4a3e8120e465479ad7368ca - git

Tree: 0aea2842d9

Alexander Gavrilov 0aea2842d9 git-gui: Make Ctrl-T safe to use for conflicting files. A previous patch added a check for conflict markers, which is done when the file is about to be staged due to a click on the icon. However, pressing Ctrl-T still immediately stages the file without confirmation. This patch fixes it. The check requires a loaded diff, so staging multiple files at once won't work if they are unmerged. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		16 years ago
..
about.tcl	…
blame.tcl	git-gui: Support the encoding menu in gui blame.	17 years ago
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	git-gui: Add more integration options to citool.	17 years ago
console.tcl	…
database.tcl	…
date.tcl	…
diff.tcl	git-gui: Reenable staging unmerged files by clicking the icon.	17 years ago
encoding.tcl	git-gui: Optimize encoding name resolution using a lookup table.	17 years ago
error.tcl	…
git-gui.ico	…
index.tcl	git-gui: Make Ctrl-T safe to use for conflicting files.	16 years ago
logo.tcl	…
merge.tcl	git-gui: Make Ctrl-T safe to use for conflicting files.	16 years ago
mergetool.tcl	git-gui: Make Ctrl-T safe to use for conflicting files.	16 years ago
option.tcl	git-gui: Add a menu of available encodings.	17 years ago
remote.tcl	…
remote_branch_delete.tcl	…
shortcut.tcl	…
spellcheck.tcl	git-gui: Help identify aspell version on Windows too	17 years ago
status_bar.tcl	…
transport.tcl	…
win32.tcl	…
win32_shortcut.js	…