summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-01-20 19:07:46 -0500
committerShawn O. Pearce <spearce@spearce.org>2007-01-21 02:54:17 -0500
commit4d583c86ec52f8b2937a0b9dc02667b54c4a28a2 (patch)
tree9c167e28766229cb13bde59d7d9da0f9450a4e05
parentbdadecbae5b9f7317994bf2f521bb15068823a1d (diff)
downloadgit-4d583c86ec52f8b2937a0b9dc02667b54c4a28a2.tar.gz
git-gui: Change more 'include' language to 'add'.
I just found a whole slew of places where we still were using the term 'include' rather than 'add' to refer to the act of updating the index with modifications from the working directory. To be consistent with all Git documentation and command line tools, these should be 'add'. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-gui b/git-gui
index c5120cc1ac..11ba41f74b 100755
--- a/git-gui
+++ b/git-gui
@@ -1935,9 +1935,9 @@ set max_status_desc 0
foreach i {
{__ i plain "Unmodified"}
{_M i mod "Modified"}
- {M_ i fulltick "Included in commit"}
+ {M_ i fulltick "Added to commit"}
{MM i parttick "Partially included"}
- {MD i question "Included (but gone)"}
+ {MD i question "Added (but gone)"}
{_O o plain "Untracked"}
{A_ o fulltick "Added by commit"}
@@ -2360,11 +2360,11 @@ proc do_include_selection {} {
if {[array size selected_paths] > 0} {
include_helper \
- {Including selected files} \
+ {Adding selected files} \
[array names selected_paths]
} elseif {$current_diff ne {}} {
include_helper \
- "Including [short_path $current_diff]" \
+ "Adding [short_path $current_diff]" \
[list $current_diff]
}
}
@@ -2384,7 +2384,7 @@ proc do_include_all {} {
}
}
include_helper \
- {Including all modified files} \
+ {Adding all modified files} \
$paths
}
@@ -2615,7 +2615,7 @@ proc do_options {} {
pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
foreach option {
- {b partialinclude {Allow Partially Included Files}}
+ {b partialinclude {Allow Partially Added Files}}
{b pullsummary {Show Pull Summary}}
{b trustmtime {Trust File Modification Timestamps}}
{i diffcontext {Number of Diff Context Lines}}
@@ -2871,7 +2871,7 @@ proc toggle_or_diff {w x y} {
}
?? {
update_index \
- "Including [short_path $path]" \
+ "Adding [short_path $path]" \
[list $path] \
[concat $after {set ui_status_value {Ready.}}]
}