diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-22 13:48:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 13:48:55 -0700 |
| commit | 1dbca52d492eab38500f435fc9af5f463d3e9c95 (patch) | |
| tree | 91d8a505b64826863ccc4f99576a2a8b0f6c07fe /git-rebase.txt | |
| parent | e1b28594a7acfaa493ca0cf32e7e970dc549527a (diff) | |
| download | git-htmldocs-1dbca52d492eab38500f435fc9af5f463d3e9c95.tar.gz | |
Autogenerated HTML docs for v2.4.1-314-g9532e
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 47984e84e..1d01baa5f 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -80,7 +80,7 @@ remain the checked-out branch. If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running `git rebase master` on the -following history (in which A' and A introduce the same set of changes, +following history (in which `A'` and `A` introduce the same set of changes, but have different committer information): ------------ |