]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge https://github.com/prati0100/git-gui
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Jan 2020 19:17:16 +0000 (11:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Jan 2020 19:18:06 +0000 (11:18 -0800)
* https://github.com/prati0100/git-gui:
  git-gui: allow opening currently selected file in default app
  git-gui: allow closing console window with Escape
  git gui: fix branch name encoding error
  git-gui: revert untracked files by deleting them
  git-gui: update status bar to track operations
  git-gui: consolidate naming conventions

1  2 
git-gui/git-gui.sh
git-gui/lib/blame.tcl
git-gui/lib/branch.tcl
git-gui/lib/checkout_op.tcl
git-gui/lib/choose_repository.tcl
git-gui/lib/chord.tcl
git-gui/lib/console.tcl
git-gui/lib/index.tcl
git-gui/lib/merge.tcl
git-gui/lib/status_bar.tcl

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,275a6cd4a1829d8ffc0d69dbcfecc4f439bd3899..275a6cd4a1829d8ffc0d69dbcfecc4f439bd3899
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge