diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-13 16:44:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 16:45:40 -0800 |
| commit | f8f2aaa17297d6b21c84641edc2f6135575a003c (patch) | |
| tree | 48158676defa9aa697d154c9490069a37f749fde /Documentation/core-intro.txt | |
| parent | 6132bd5cac91c2a42d67f92fd2e266678c6c8474 (diff) | |
| parent | 4cc41a16c15a6d73b13f9211eb8bf49ec869705f (diff) | |
| download | git-f8f2aaa17297d6b21c84641edc2f6135575a003c.tar.gz | |
Merge branch 'jc/deprecate'
As previously announced, diff-stages and resolve are now gone.
Diffstat (limited to 'Documentation/core-intro.txt')
| -rw-r--r-- | Documentation/core-intro.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt index abafefc71c..24b060b91e 100644 --- a/Documentation/core-intro.txt +++ b/Documentation/core-intro.txt @@ -587,4 +587,5 @@ stages to temporary files and calls a "merge" script on it: git-merge-index git-merge-one-file hello.c -and that is what higher level `git resolve` is implemented with. +and that is what higher level `git merge -s resolve` is implemented +with. |