summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-30 13:23:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-30 13:23:53 -0700
commitdcbf0417453297207c7e61efbf1f38621b1caa3f (patch)
treef988ff10dc493f562ead94f1110ff1162db0c268 /Documentation/technical
parentMerge branch 'maint-1.6.0' into maint-1.6.1 (diff)
parentFix bash completion in path with spaces (diff)
downloadtgif-dcbf0417453297207c7e61efbf1f38621b1caa3f.tar.xz
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example.
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/api-history-graph.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/technical/api-history-graph.txt b/Documentation/technical/api-history-graph.txt
index e9559790a3..d66e61b1ec 100644
--- a/Documentation/technical/api-history-graph.txt
+++ b/Documentation/technical/api-history-graph.txt
@@ -148,22 +148,22 @@ outputting that information, if desired.
------------
*
*
-M
+*
|\
* |
| | *
| \ \
| \ \
-M-. \ \
+*-. \ \
|\ \ \ \
| | * | |
| | | | | *
| | | | | *
-| | | | | M
+| | | | | *
| | | | | |\
| | | | | | *
| * | | | | |
-| | | | | M \
+| | | | | * \
| | | | | |\ |
| | | | * | | |
| | | | * | | |