diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-27 02:49:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-27 02:49:01 (GMT) |
| commit | 2fe18392f0355c80295b8b74b24fc817183d3752 (patch) | |
| tree | 46feb2f65ad4589475ff946bb34b8abd4a5a928d /Documentation/git-rev-parse.txt | |
| parent | 2d3cfd77ad5305c132f7b23c192ae6c327443c95 (diff) | |
| parent | 109440c1bf2a3015cd9253515f07231c4cf9d65a (diff) | |
| download | git-2fe18392f0355c80295b8b74b24fc817183d3752.zip git-2fe18392f0355c80295b8b74b24fc817183d3752.tar.gz git-2fe18392f0355c80295b8b74b24fc817183d3752.tar.bz2 | |
Merge branch 'maint'
* maint:
Documentation: fix graph in git-rev-parse.txt
show-branch --current: do not barf on detached HEAD
Diffstat (limited to 'Documentation/git-rev-parse.txt')
| -rw-r--r-- | Documentation/git-rev-parse.txt | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 69599ff..5641d99 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -243,16 +243,18 @@ Here is an illustration, by Jon Loeliger. Both commit nodes B and C are parents of commit node A. Parent commits are ordered left-to-right. - G H I J - \ / \ / - D E F - \ | / \ - \ | / | - \|/ | - B C - \ / - \ / - A +........................................ +G H I J + \ / \ / + D E F + \ | / \ + \ | / | + \|/ | + B C + \ / + \ / + A +........................................ A = = A^0 B = A^ = A^1 = A~1 |