diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-04 00:06:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-04 00:18:29 -0800 |
| commit | 3746501664e3fcf6c44080cb599b50bf9cbea2be (patch) | |
| tree | d032e26b9d623a605fb9f8941e96ad62a7344aa3 /Documentation/Makefile | |
| parent | 810bf1f9448c1db7f52cfa43c077c677fb080fce (diff) | |
| download | git-3746501664e3fcf6c44080cb599b50bf9cbea2be.tar.gz git-3746501664e3fcf6c44080cb599b50bf9cbea2be.tar.xz | |
Documentation: -merge and -pull: describe merge strategies.
... and give a couple of examples of running 'git pull' against
local repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 3cfa360a9..741f14cfa 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -52,10 +52,15 @@ install: man # 'include' dependencies $(patsubst %.txt,%.1,$(wildcard git-diff-*.txt)): \ diff-format.txt diff-options.txt -$(patsubst %,%.1,git-fetch git-pull git-push): pull-fetch-param.txt $(patsubst %.txt,%.html,$(wildcard git-diff-*.txt)): \ diff-format.txt diff-options.txt + +$(patsubst %,%.1,git-fetch git-pull git-push): pull-fetch-param.txt $(patsubst %,%.html,git-fetch git-pull git-push): pull-fetch-param.txt + +$(patsubst %,%.1,git-merge git-pull): merge-pull-opts.txt +$(patsubst %,%.html,git-merge git-pull): merge-pull-opts.txt + git.7: ../README clean: |