diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-19 01:38:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-19 01:38:18 -0800 |
| commit | 5fed4668153c9ca6e44ec84a0976089f515705aa (patch) | |
| tree | 82f3ce0d2ea76ca31cebd3a5b40d0993e019859a /Documentation/git-merge-file.txt | |
| parent | git-clone: lose the traditional 'no-separate-remote' layout (diff) | |
| parent | Introduce GIT_TEMPLATE_DIR (diff) | |
| download | tgif-5fed4668153c9ca6e44ec84a0976089f515705aa.tar.xz | |
Merge branch 'jc/test-clone' into jc/clone
* jc/test-clone: (35 commits)
Introduce GIT_TEMPLATE_DIR
Revert "fix testsuite: make sure they use templates freshly built from the source"
fix testsuite: make sure they use templates freshly built from the source
rerere: fix breakage of resolving.
Add config example with respect to branch
Add documentation for show-branch --topics
make git a bit less cryptic on fetch errors
make patch_delta() error cases a bit more verbose
racy-git: documentation updates.
show-ref: fix --exclude-existing
parse-remote::expand_refs_wildcard()
vim syntax: follow recent changes to commit template
show-ref: fix --verify --hash=length
show-ref: fix --quiet --verify
avoid accessing _all_ loose refs in git-show-ref --verify
git-fetch: Avoid reading packed refs over and over again
Teach show-branch how to show ref-log data.
markup fix in svnimport documentation.
Documentation: new option -P for git-svnimport
Fix mis-mark-up in git-merge-file.txt documentation
...
Diffstat (limited to 'Documentation/git-merge-file.txt')
| -rw-r--r-- | Documentation/git-merge-file.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 0b41d66a70..29d3faa556 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -1,9 +1,9 @@ git-merge-file(1) -============ +================= NAME ---- -git-merge-file - threeway file merge +git-merge-file - three-way file merge SYNOPSIS |