mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
Merge branch 'maint'
* maint: git-show-ref.txt: remove word and make consistent git-svn documentation: fix typo in 'rebase vs. pull/merge' section
This commit is contained in:
commit
c5764c095c
2 changed files with 3 additions and 3 deletions
|
@ -24,7 +24,7 @@ The --exclude-existing form is a filter that does the inverse, it shows the
|
|||
refs from stdin that don't exist in the local repository.
|
||||
|
||||
Use of this utility is encouraged in favor of directly accessing files under
|
||||
in the `.git` directory.
|
||||
the `.git` directory.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
@ -50,7 +50,7 @@ OPTIONS
|
|||
-s::
|
||||
--hash::
|
||||
|
||||
Only show the SHA1 hash, not the reference name. When also using
|
||||
Only show the SHA1 hash, not the reference name. When combined with
|
||||
--dereference the dereferenced tag will still be shown after the SHA1.
|
||||
|
||||
--verify::
|
||||
|
|
|
@ -623,7 +623,7 @@ pulled or merged from. This is because the author favored
|
|||
If you use `git svn set-tree A..B` to commit several diffs and you do
|
||||
not have the latest remotes/git-svn merged into my-branch, you should
|
||||
use `git svn rebase` to update your work branch instead of `git pull` or
|
||||
`git merge`. `pull`/`merge' can cause non-linear history to be flattened
|
||||
`git merge`. `pull`/`merge` can cause non-linear history to be flattened
|
||||
when committing into SVN, which can lead to merge commits reversing
|
||||
previous commits in SVN.
|
||||
|
||||
|
|
Loading…
Reference in a new issue