diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-29 10:39:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-02 04:57:00 (GMT) |
| commit | 328c6cb853d7237098569de9f94bc3d259846a08 (patch) | |
| tree | 2c60dadbceba1dca728bc74fd14100f4dc71178d /unpack-trees.c | |
| parent | ae36fe694180ad2646983d43c5bf12841ac2db47 (diff) | |
| download | git-328c6cb853d7237098569de9f94bc3d259846a08.zip git-328c6cb853d7237098569de9f94bc3d259846a08.tar.gz git-328c6cb853d7237098569de9f94bc3d259846a08.tar.bz2 | |
doc: promote "git switch"
The new command "git switch" is added to avoid the confusion of
one-command-do-all "git checkout" for new users. They are also helpful
to avoid ambiguation context.
For these reasons, promote it everywhere possible. This includes
documentation, suggestions/advice from other commands...
The "Checking out files" progress line in unpack-trees.c is also updated
to "Updating files" to be neutral to both git-checkout and git-switch.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 22c41a3..5ff64a9 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -313,7 +313,7 @@ static struct progress *get_progress(struct unpack_trees_options *o) total++; } - return start_delayed_progress(_("Checking out files"), total); + return start_delayed_progress(_("Updating files"), total); } static void setup_collided_checkout_detection(struct checkout *state, |