From 045fe3ccdaeb81f12f657b44b5a117b65d9d38e2 Mon Sep 17 00:00:00 2001 From: Quy Tonthat Date: Tue, 15 May 2007 12:51:02 +1000 Subject: Documentation/branch: fix small typo in -D example Signed-off-by: Quy Tonthat Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 603f87f3b5..8dc5171f5e 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -136,7 +136,7 @@ $ git branch -D test <2> + <1> delete remote-tracking branches "todo", "html", "man" <2> delete "test" branch even if the "master" branch does not have all -commits from todo branch. +commits from test branch. Notes -- cgit v1.2.3 From 61d7256431da590dfca689e0681ed9437fd5d448 Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Wed, 16 May 2007 07:48:47 +0200 Subject: Fixed link in user-manual link to git-mergetool was broken. Signed-off-by: Steffen Prohaska Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 13db9699c1..dd1578dc8d 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1357,7 +1357,7 @@ $ gitk --merge These will display all commits which exist only on HEAD or on MERGE_HEAD, and which touch an unmerged file. -You may also use gitlink:git-mergetool, which lets you merge the +You may also use gitlink:git-mergetool[1], which lets you merge the unmerged files using external tools such as emacs or kdiff3. Each time you resolve the conflicts in a file and update the index: -- cgit v1.2.3