projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 93bf742 b524f6b)
Merge https://github.com/prati0100/git-gui
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Nov 2019 04:29:38 +0000 (13:29 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Nov 2019 04:29:38 +0000 (13:29 +0900)
commitab6b50e4c8339167c0b048c778055526226c45ca
treef378953158b99acafc700cff190ee31b0f964593tree | snapshot
parent93bf7423dd21c9d7bf2fd99c97cbfcb74740eac3commit | diff
parentb524f6b399c77b40c8bf2b6217585fde4731472acommit | diff
Merge https://github.com/prati0100/git-gui

* https://github.com/prati0100/git-gui:
  git-gui: improve Japanese translation
  git-gui: add a readme
  git-gui: support for diff3 conflict style
  git-gui: use existing interface to query a path's attribute
  git-gui (Windows): use git-bash.exe if it is available
  treewide: correct several "up-to-date" to "up to date"
  Fix build with core.autocrlf=true
git-gui/README.md | | blob
git-gui/git-gui.sh diff1 | diff2 | blob | history
git-gui/lib/diff.tcl diff1 | diff2 | blob | history
git-gui/po/ja.po diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.