diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-07-03 00:28:15 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-05 11:24:39 -0700 |
| commit | 467c0197fd0a49078d05839ee385046cd3707a5b (patch) | |
| tree | 095670c2273f619614055a6cb82f05dd5842f397 /Documentation/git-rerere.txt | |
| parent | 7a7d4ef69c2c79b10977508794e1bbd62ca9ed2b (diff) | |
| download | git-467c0197fd0a49078d05839ee385046cd3707a5b.tar.gz | |
Documentation: more "git-" versus "git " changes
With git-commands moving out of $(bindir), it is useful to make a
clearer distinction between the git subcommand 'git-whatever' and
the command you type, `git whatever <options>`. So we use a dash
after "git" when referring to the former and not the latter.
I already sent a patch doing this same thing, but I missed some
spots.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 3458029042..ae2b2b543a 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -163,7 +163,7 @@ If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually resolve it. Note that `git-rerere` leaves the index file alone, so you still need to do the final sanity checks with `git diff` -(or `git diff -c`) and `git add` when you are satisfied. +(or `git diff -c`) and `git-add` when you are satisfied. As a convenience measure, `git-merge` automatically invokes `git-rerere` when it exits with a failed automerge, which |