mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge updated git-gui and gitk that call each other

Browse Source 
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
This commit is contained in:
Junio C Hamano
2008-09-06 18:06:39 -07:00
parent 4a09bc9664 95b6a2db25 77aa0ae8d3
commit 5fc3e67ac0
9 changed files with 942 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-gui/lib/commit.tcl
View File

@ -149,7 +149,9 @@ The rescan will be automatically started now.
_? {continue}
A? -
D? -
T_ -
M? {set files_ready 1}
_U -
U? {
error_popup [mc "Unmerged files cannot be committed.
@ -428,6 +430,7 @@ A rescan will be automatically started now.
__ -
A_ -
M_ -
T_ -
D_ {
unset file_states($path)
catch {unset selected_paths($path)}