diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-29 23:44:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-29 23:44:30 -0700 |
| commit | e8811929344c46aed7669e148527af054eb3e18b (patch) | |
| tree | 40d3831e5fe145fd283d119dbed981521cd00e98 /Documentation/git-rev-parse.txt | |
| parent | b275a0c9e742e4bbfed9794b1e477000440eaf6a (diff) | |
| parent | 3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35 (diff) | |
| download | git-e8811929344c46aed7669e148527af054eb3e18b.tar.gz git-e8811929344c46aed7669e148527af054eb3e18b.tar.xz | |
Merge branch 'maint'
* maint:
git-upload-pack: make sure we close unused pipe ends
Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
Documentation/git-svnimport.txt: fix typo.
Diffstat (limited to 'Documentation/git-rev-parse.txt')
| -rw-r--r-- | Documentation/git-rev-parse.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index ccc66aae7..a8bf6561e 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -265,14 +265,14 @@ its all parents. Here are a handful examples: - D A B D - D F A B C D F - ^A G B D - ^A F B C F - G...I C D F G I - ^B G I C D F G I - F^@ A B C - F^! H D F H + D G H D + D F G H I J D F + ^G D H D + ^D B E I J F B + B...C G H D E B C + ^D B C E I J F B C + C^@ I J F + F^! D G H D F Author ------ |