mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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:
Junio C Hamano
2008-06-19 16:30:48 -07:00
parent 5e2c08c6f0 3b2bbe9b85
commit d3e977b943
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-svn.txt
View File

@ -448,6 +448,8 @@ svn-remote.<name>.rewriteRoot::
the repository with a public http:// or svn:// URL in the the repository with a public http:// or svn:// URL in the
metadata so users of it will see the public URL. metadata so users of it will see the public URL.
--
Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps
options all affect the metadata generated and used by git-svn; they options all affect the metadata generated and used by git-svn; they
*must* be set in the configuration file before any history is imported *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 Additionally, only one of these four options can be used per-svn-remote
section because they affect the 'git-svn-id:' metadata line. section because they affect the 'git-svn-id:' metadata line.
--
BASIC EXAMPLES BASIC EXAMPLES
-------------- --------------

1
contrib/completion/git-completion.bash
View File

@ -761,6 +761,7 @@ _git_log ()
--pretty= --name-status --name-only --raw --pretty= --name-status --name-only --raw
--not --all --not --all
--left-right --cherry-pick --left-right --cherry-pick
--graph
" "
return return
;; ;;

2
git-merge.sh
View File

@ -13,7 +13,7 @@ n don't show a diffstat at the end of the merge
summary (synonym to --stat) summary (synonym to --stat)
log add list of one-line log to merge commit message log add list of one-line log to merge commit message
squash create a single commit instead of doing a merge 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) ff allow fast forward (default)
s,strategy= merge strategy to use s,strategy= merge strategy to use
m,message= message to be used for the merge commit (if any) m,message= message to be used for the merge commit (if any)

6
t/t7502-commit.sh
View File

@ -212,7 +212,11 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
# Must fail due to conflict # Must fail due to conflict
test_must_fail git cherry-pick -n master && test_must_fail git cherry-pick -n master &&
echo "editor not started" >.git/result && 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" test "$(cat .git/result)" = "editor not started"
' '