mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'maint'
* maint: Fixing path quoting in git-rebase Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites. Documentation: quote commit messages consistently. Remove escaping of '|' in manpage option sections
This commit is contained in:
commit
e3d6d56f1c
|
@ -828,7 +828,7 @@ that branch, and do some work there.
|
|||
------------------------------------------------
|
||||
$ git checkout mybranch
|
||||
$ echo "Work, work, work" >>hello
|
||||
$ git commit -m 'Some work.' -i hello
|
||||
$ git commit -m "Some work." -i hello
|
||||
------------------------------------------------
|
||||
|
||||
Here, we just added another line to `hello`, and we used a shorthand for
|
||||
|
@ -853,7 +853,7 @@ hasn't happened in the `master` branch at all. Then do
|
|||
------------
|
||||
$ echo "Play, play, play" >>hello
|
||||
$ echo "Lots of fun" >>example
|
||||
$ git commit -m 'Some fun.' -i hello example
|
||||
$ git commit -m "Some fun." -i hello example
|
||||
------------
|
||||
|
||||
since the master branch is obviously in a much better mood.
|
||||
|
@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then
|
|||
'commit-fix' next, like this:
|
||||
|
||||
------------
|
||||
$ git merge -m 'Merge fix in diff-fix' diff-fix
|
||||
$ git merge -m 'Merge fix in commit-fix' commit-fix
|
||||
$ git merge -m "Merge fix in diff-fix" diff-fix
|
||||
$ git merge -m "Merge fix in commit-fix" commit-fix
|
||||
------------
|
||||
|
||||
Which would result in:
|
||||
|
|
|
@ -109,7 +109,7 @@ $ tar zxf frotz.tar.gz
|
|||
$ cd frotz
|
||||
$ git-init
|
||||
$ git add . <1>
|
||||
$ git commit -m 'import of frotz source tree.'
|
||||
$ git commit -m "import of frotz source tree."
|
||||
$ git tag v2.43 <2>
|
||||
------------
|
||||
+
|
||||
|
@ -300,7 +300,7 @@ $ git merge topic/one topic/two && git merge hold/linus <8>
|
|||
$ git checkout maint
|
||||
$ git cherry-pick master~4 <9>
|
||||
$ compile/test
|
||||
$ git tag -s -m 'GIT 0.99.9x' v0.99.9x <10>
|
||||
$ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>
|
||||
$ git fetch ko && git show-branch master maint 'tags/ko-*' <11>
|
||||
$ git push ko <12>
|
||||
$ git push ko v0.99.9x <13>
|
||||
|
|
|
@ -152,7 +152,7 @@ definition impossible to preserve signatures at any rate.)
|
|||
does this in the '.git-rewrite/' directory but you can override
|
||||
that choice by this parameter.
|
||||
|
||||
-f\|--force::
|
||||
-f|--force::
|
||||
`git filter-branch` refuses to start with an existing temporary
|
||||
directory or when there are already refs starting with
|
||||
'refs/original/', unless forced.
|
||||
|
|
|
@ -157,7 +157,7 @@ need to get to the other branch for a quick bugfix.
|
|||
------------
|
||||
$ git checkout feature ;# you were working in "feature" branch and
|
||||
$ work work work ;# got interrupted
|
||||
$ git commit -a -m 'snapshot WIP' <1>
|
||||
$ git commit -a -m "snapshot WIP" <1>
|
||||
$ git checkout master
|
||||
$ fix fix fix
|
||||
$ git commit ;# commit with real log
|
||||
|
|
|
@ -16,7 +16,7 @@ Remove multiple empty lines, and empty lines at beginning and end.
|
|||
|
||||
OPTIONS
|
||||
-------
|
||||
-s\|--strip-comments::
|
||||
-s|--strip-comments::
|
||||
In addition to empty lines, also strip lines starting with '#'.
|
||||
|
||||
<stream>::
|
||||
|
|
|
@ -44,7 +44,7 @@ test_expect_success setup '
|
|||
test_expect_success 'cherry-pick after renaming branch' '
|
||||
|
||||
git checkout rename2 &&
|
||||
EDITOR=: VISUAL=: git cherry-pick added &&
|
||||
git cherry-pick added &&
|
||||
test -f opos &&
|
||||
grep "Add extra line at the end" opos
|
||||
|
||||
|
@ -53,7 +53,7 @@ test_expect_success 'cherry-pick after renaming branch' '
|
|||
test_expect_success 'revert after renaming branch' '
|
||||
|
||||
git checkout rename1 &&
|
||||
EDITOR=: VISUAL=: git revert added &&
|
||||
git revert added &&
|
||||
test -f spoo &&
|
||||
! grep "Add extra line at the end" spoo
|
||||
|
||||
|
|
|
@ -154,7 +154,7 @@ test_expect_success 'cherry-pick(U/U)' '
|
|||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
git cherry-pick side &&
|
||||
EDITOR=: VISUAL=: git revert HEAD &&
|
||||
git revert HEAD &&
|
||||
|
||||
check_encoding 3
|
||||
'
|
||||
|
@ -169,7 +169,7 @@ test_expect_success 'cherry-pick(L/L)' '
|
|||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
git cherry-pick side &&
|
||||
EDITOR=: VISUAL=: git revert HEAD &&
|
||||
git revert HEAD &&
|
||||
|
||||
check_encoding 3 8859
|
||||
'
|
||||
|
@ -184,7 +184,7 @@ test_expect_success 'cherry-pick(U/L)' '
|
|||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
git cherry-pick side &&
|
||||
EDITOR=: VISUAL=: git revert HEAD &&
|
||||
git revert HEAD &&
|
||||
|
||||
check_encoding 3
|
||||
'
|
||||
|
@ -200,7 +200,7 @@ test_expect_success 'cherry-pick(L/U)' '
|
|||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
git cherry-pick side &&
|
||||
EDITOR=: VISUAL=: git revert HEAD &&
|
||||
git revert HEAD &&
|
||||
|
||||
check_encoding 3 8859
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue