diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-31 00:25:27 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-31 00:25:27 +0400 |
| commit | b19293df9e84ed056bc984aa7ef716689b58b0b1 (patch) | |
| tree | 4c7eeda9e1f66f31cd30a89c48848195cdd4517e /Documentation/technical | |
| parent | 510a309e5e0997c73d97c85332a99d622f06ace6 (diff) | |
| parent | dcbf0417453297207c7e61efbf1f38621b1caa3f (diff) | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
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.
Conflicts:
contrib/completion/git-completion.bash
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | Documentation/technical/api-history-graph.txt | 8 |
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 \ +| | | | | * \ | | | | | |\ | | | | | * | | | | | | | * | | | |