summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3c56c84)
raw | patch | inline | side by side (parent: 3c56c84)
author | Jonathan Nieder <jrnieder@gmail.com> | |
Fri, 20 Aug 2010 10:39:48 +0000 (05:39 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 20 Aug 2010 21:16:51 +0000 (14:16 -0700) |
The symmetric difference or merge-base operator ... as used by
rev-list and diff is actually three period characters. If it
gets replaced by an ellipsis glyph in the manual, that would
stop readers from copying and pasting it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
rev-list and diff is actually three period characters. If it
gets replaced by an ellipsis glyph in the manual, that would
stop readers from copying and pasting it.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
index 66e570113a077d2c52c4fc3ac09d24a272df5301..f88e9977d1137da0449736f5f8fe6746b42437e1 100644 (file)
checks out the branch (instead of detaching). You may also specify
`-` which is synonymous with `"@\{-1\}"`.
+
-As a further special case, you may use `"A...B"` as a shortcut for the
+As a further special case, you may use `"A\...B"` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
index 658ff2ff67f23e9a9d2942e38528dba415139ac3..020955ff5a8635e385208a6a89b1ad71125fb205 100644 (file)
For a successfully pushed ref, the summary shows the old and new
values of the ref in a form suitable for using as an argument to
`git log` (this is `<old>..<new>` in most cases, and
- `<old>...<new>` for forced non-fast-forward updates).
+ `<old>\...<new>` for forced non-fast-forward updates).
+
For a failed update, more details are given:
+
index b4314568f5a742d186e69b97f782193d2883e6b3..b8aa0b999ddf878823622d3884d9def81996c7ff 100644 (file)
<upstream>. May be any valid commit, and not just an
existing branch name.
+
-As a special case, you may use "A...B" as a shortcut for the
+As a special case, you may use "A\...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can
leave out at most one of A and B, in which case it defaults to HEAD.
index cc562a057af3694d3518bc91b52ae322b6b1d9cc..e2237ae4a0a80b0e5aa22cbb13aa5a01ce4fb891 100644 (file)
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
exclude (that is, '{caret}commit', 'commit1..commit2',
- nor 'commit1...commit2' notations cannot be used).
+ nor 'commit1\...commit2' notations cannot be used).
+
With '\--pretty' format other than oneline (for obvious reasons),
this causes the output to have two extra lines of information