diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-30 22:29:57 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-30 22:29:57 +0200 |
commit | 442dd42d6d4903640b0dc5561481a77c88dcea90 (patch) | |
tree | ee755ba591e8d3e81941e0dc3dd80420dfde0790 /Documentation/technical | |
parent | Documentation: push.default applies to all remotes (diff) | |
parent | Update draft release notes to 1.6.2.2 (diff) | |
download | git-442dd42d6d4903640b0dc5561481a77c88dcea90.tar.xz git-442dd42d6d4903640b0dc5561481a77c88dcea90.zip |
Merge branch 'maint'
* maint:
Update draft release notes to 1.6.2.2
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.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 \ +| | | | | * \ | | | | | |\ | | | | | * | | | | | | | * | | | |