Skip to content

Commit e467164

Browse files
committedJul 11, 2016
Make documentation more uniform
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
1 parent 50f5774 commit e467164

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed
 

‎README

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ $ brew install git-when-merged
1212
```
1313

1414
Usage
15-
----------
15+
-----
1616
git when-merged [OPTIONS] COMMIT [BRANCH...]
1717

18-
Find when a commit was merged into one or more branches. Find the merge
19-
commit that brought COMMIT into the specified BRANCH(es). Specificially, look
20-
for the oldest commit on the first-parent history of BRANCH that contains the
21-
COMMIT as an ancestor.
18+
Find the merge commit that brought COMMIT into the specified
19+
BRANCH(es). Specifically, look for the oldest commit on the
20+
first-parent history of each BRANCH that contains the COMMIT as an
21+
ancestor.
2222

2323
Options:
2424
-h, --help show this help message and exit
@@ -61,7 +61,8 @@ Examples:
6161
git when-merged 0a1b -r feature-1 # If merged indirectly, show all
6262
# merges involved.
6363

64-
git when-merged 0a1b -d feature-1 # Show diff for each merge commit
64+
git when-merged 0a1b -l feature-1 # Show log for the merge commit
65+
git when-merged 0a1b -d feature-1 # Show diff for the merge commit
6566
git when-merged 0a1b -v feature-1 # Display merge commit in gitk
6667

6768
Configuration:

‎bin/git-when-merged

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"""Find when a commit was merged into one or more branches.
2323
2424
Find the merge commit that brought COMMIT into the specified
25-
BRANCH(es). Specificially, look for the oldest commit on the
26-
first-parent history of BRANCH that contains the COMMIT as an
25+
BRANCH(es). Specifically, look for the oldest commit on the
26+
first-parent history of each BRANCH that contains the COMMIT as an
2727
ancestor.
2828
2929
"""

0 commit comments

Comments
 (0)
Please sign in to comment.