Merge branch 'maint'
* maint: Documentation: fix formatting in git-svn t7502-commit.sh: test_must_fail doesn't work with inline environment variables completion: add --graph to log command completion git-merge.sh: fix typo in usage message: sucesses --> succeeds
This commit is contained in:
commit
d3e977b943
@ -448,6 +448,8 @@ svn-remote.<name>.rewriteRoot::
|
||||
the repository with a public http:// or svn:// URL in the
|
||||
metadata so users of it will see the public URL.
|
||||
|
||||
--
|
||||
|
||||
Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps
|
||||
options all affect the metadata generated and used by git-svn; they
|
||||
*must* be set in the configuration file before any history is imported
|
||||
@ -456,7 +458,6 @@ and these settings should never be changed once they are set.
|
||||
Additionally, only one of these four options can be used per-svn-remote
|
||||
section because they affect the 'git-svn-id:' metadata line.
|
||||
|
||||
--
|
||||
|
||||
BASIC EXAMPLES
|
||||
--------------
|
||||
|
@ -761,6 +761,7 @@ _git_log ()
|
||||
--pretty= --name-status --name-only --raw
|
||||
--not --all
|
||||
--left-right --cherry-pick
|
||||
--graph
|
||||
"
|
||||
return
|
||||
;;
|
||||
|
@ -13,7 +13,7 @@ n don't show a diffstat at the end of the merge
|
||||
summary (synonym to --stat)
|
||||
log add list of one-line log to merge commit message
|
||||
squash create a single commit instead of doing a merge
|
||||
commit perform a commit if the merge sucesses (default)
|
||||
commit perform a commit if the merge succeeds (default)
|
||||
ff allow fast forward (default)
|
||||
s,strategy= merge strategy to use
|
||||
m,message= message to be used for the merge commit (if any)
|
||||
|
@ -212,7 +212,11 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
|
||||
# Must fail due to conflict
|
||||
test_must_fail git cherry-pick -n master &&
|
||||
echo "editor not started" >.git/result &&
|
||||
test_must_fail GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" git commit &&
|
||||
(
|
||||
GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" &&
|
||||
export GIT_EDITOR &&
|
||||
test_must_fail git commit
|
||||
) &&
|
||||
test "$(cat .git/result)" = "editor not started"
|
||||
'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user