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

git-gui: Unify wording to say "to stage" instead of "to add"

Browse Source 
Also, the warning message when clicking "Reset" is adapted to
the wording "Reset" rather than a confusion "Cancel commit?".

Signed-off-by: Christian Stimming <stimming@tuhh.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Christian Stimming
2007-07-28 22:17:10 +02:00
committed by Shawn O. Pearce
parent 1e0a92fdf7
commit 360cc106e7
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/commit.tcl
View File

@ -153,7 +153,7 @@ The rescan will be automatically started now.
U? {
error_popup "Unmerged files cannot be committed.
File [short_path $path] has merge conflicts. You must resolve them and add the file before committing.
File [short_path $path] has merge conflicts. You must resolve them and stage the file before committing.
"
unlock_index
return
@ -169,7 +169,7 @@ File [short_path $path] cannot be committed by this program.
if {!$files_ready && ![string match *merge $curType]} {
info_popup {No changes to commit.
You must add at least 1 file before you can commit.
You must stage at least 1 file before you can commit.
}
unlock_index
return