diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-10-03 12:05:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-10-03 12:05:53 +0000 |
| commit | 1b50ce9004d2296213fca188964ee273b87b2d12 (patch) | |
| tree | fce55ef06d77843213ec1fe5add1d9ff75e79a77 /merge-options.txt | |
| parent | 58992c945be1eab6cb6bc22216c90de22b30341f (diff) | |
| download | git-htmldocs-1b50ce9004d2296213fca188964ee273b87b2d12.tar.gz | |
Autogenerated HTML docs for v1.5.3.4-203-gcc61a
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index d64c259bb..9f1fc8255 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -10,6 +10,10 @@ not autocommit, to give the user a chance to inspect and further tweak the merge result before committing. +--commit:: + Perform the merge and commit the result. This option can + be used to override --no-commit. + --squash:: Produce the working tree and index state as if a real merge happened, but do not actually make a commit or @@ -19,6 +23,19 @@ top of the current branch whose effect is the same as merging another branch (or more in case of an octopus). +--no-squash:: + Perform the merge and commit the result. This option can + be used to override --squash. + +--no-ff:: + Generate a merge commit even if the merge resolved as a + fast-forward. + +--ff:: + Do not generate a merge commit if the merge resolved as + a fast-forward, only update the branch pointer. This is + the default behavior of git-merge. + -s <strategy>, \--strategy=<strategy>:: Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. |