diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-18 15:53:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-18 15:53:37 -0800 |
| commit | c3f0baacadbd7b5710052213a2ec3cdd5b77bb6e (patch) | |
| tree | 5f79fc30175a5a28a7dbb0ea9ff3893ab2dcdc42 /Documentation/git-merge.txt | |
| parent | Documentation: move command list in git.txt into separate files. (diff) | |
| download | tgif-c3f0baacadbd7b5710052213a2ec3cdd5b77bb6e.tar.xz | |
Documentation: sync git.txt command list and manual page title
Also reorders a handful entries to make each list sorted
alphabetically.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 0f79665ea6..3c08a6f7db 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -3,7 +3,7 @@ git-merge(1) NAME ---- -git-merge - Grand Unified Merge Driver +git-merge - Join two or more development histories together SYNOPSIS |