3 # Copyright (c) 2005 Junio C Hamano
8 git-merge [options] <remote>...
9 git-merge [options] <msg> HEAD <remote>
11 stat show a diffstat at the end of the merge
12 n,no-stat don't show a diffstat at the end of the merge
13 summary (synonym to --stat)
14 no-summary (synonym to --no-stat)
15 squash create a single commit instead of doing a merge
16 commit perform a commit if the merge sucesses (default)
17 ff allow fast forward (default)
18 s,strategy= merge strategy to use
19 m,message= message to be used for the merge commit (if any)
27 test -z "$(git ls-files -u)" ||
28 die
"You are in the middle of a conflicted merge."
33 all_strategies
='recur recursive octopus resolve stupid ours subtree'
34 default_twohead_strategies
='recursive'
35 default_octopus_strategies
='octopus'
36 no_fast_forward_strategies
='subtree ours'
37 no_trivial_strategies
='recursive recur subtree ours'
45 rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
46 "$GIT_DIR/MERGE_STASH" ||
exit 1
50 # Stash away any local modifications.
51 git stash create
>"$GIT_DIR/MERGE_STASH"
55 if test -f "$GIT_DIR/MERGE_STASH"
57 git
reset --hard $head >/dev
/null
58 git stash apply $
(cat "$GIT_DIR/MERGE_STASH")
59 git update-index
--refresh >/dev
/null
63 finish_up_to_date
() {
66 echo "$1 (nothing to squash)" ;;
74 echo Squashed commit of the following
:
76 git log
--no-merges --pretty=medium ^
"$head" $remoteheads
82 rlogm
="$GIT_REFLOG_ACTION"
85 rlogm
="$GIT_REFLOG_ACTION: $2"
89 echo "Squash commit -- not updating HEAD"
90 squash_message
>"$GIT_DIR/SQUASH_MSG"
95 echo "No merge message -- not updating HEAD"
98 git update-ref
-m "$rlogm" HEAD
"$1" "$head" ||
exit 1
108 if test "$show_diffstat" = t
110 # We want color (if set), but no pager
111 GIT_PAGER
='' git
diff --stat --summary -M "$head" "$1"
116 # Run a post-merge hook
117 if test -x "$GIT_DIR"/hooks
/post-merge
121 "$GIT_DIR"/hooks
/post-merge
1
124 "$GIT_DIR"/hooks
/post-merge
0
132 rh
=$
(git rev-parse
--verify "$remote^0" 2>/dev
/null
) ||
return
133 bh
=$
(git show-ref
-s --verify "refs/heads/$remote" 2>/dev
/null
)
134 if test "$rh" = "$bh"
136 echo "$rh branch '$remote' of ."
137 elif truname
=$
(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
138 git show-ref
-q --verify "refs/heads/$truname" 2>/dev
/null
140 echo "$rh branch '$truname' (early part) of ."
141 elif test "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD"
143 sed -e 's/ not-for-merge / /' -e 1q \
144 "$GIT_DIR/FETCH_HEAD"
146 echo "$rh commit '$remote'"
151 while test $# != 0; do
153 -n|
--no-stat|
--no-summary)
154 show_diffstat
=false
;;
158 test "$allow_fast_forward" = t ||
159 die
"You cannot combine --squash with --no-ff."
160 squash
=t no_commit
=t
;;
162 squash
= no_commit
= ;;
168 allow_fast_forward
=t
;;
170 test "$squash" != t ||
171 die
"You cannot combine --squash with --no-ff."
172 allow_fast_forward
=f
;;
175 case " $all_strategies " in
177 use_strategies
="$use_strategies$1 " ;;
179 die
"available strategies are: $all_strategies" ;;
197 test $# != 0 || usage
201 if branch
=$
(git-symbolic-ref
-q HEAD
)
203 mergeopts
=$
(git config
"branch.${branch#refs/heads/}.mergeoptions")
204 if test -n "$mergeopts"
206 parse_config
$mergeopts --
211 while test $args_left -lt $#; do shift; done
213 if test -z "$show_diffstat"; then
214 test "$(git config --bool merge.diffstat)" = false
&& show_diffstat
=false
215 test "$(git config --bool merge.stat)" = false
&& show_diffstat
=false
216 test -z "$show_diffstat" && show_diffstat
=t
219 # This could be traditional "merge <msg> HEAD <commit>..." and the
220 # way we can tell it is to see if the second token is HEAD, but some
221 # people might have misused the interface and used a committish that
222 # is the same as HEAD there instead. Traditional format never would
223 # have "-m" so it is an additional safety measure to check for it.
225 if test -z "$have_message" &&
226 second_token
=$
(git rev-parse
--verify "$2^0" 2>/dev
/null
) &&
227 head_commit
=$
(git rev-parse
--verify "HEAD" 2>/dev
/null
) &&
228 test "$second_token" = "$head_commit"
234 elif ! git rev-parse
--verify HEAD
>/dev
/null
2>&1
236 # If the merged head is a valid one there is no reason to
237 # forbid "git merge" into a branch yet to be born. We do
238 # the same for "git pull".
241 echo >&2 "Can merge only exactly one commit into empty head"
245 rh
=$
(git rev-parse
--verify "$1^0") ||
246 die
"$1 - not something we can merge"
248 git update-ref
-m "initial pull" HEAD
"$rh" "" &&
249 git read-tree
--reset -u HEAD
253 # We are invoked directly as the first-class UI.
256 # All the rest are the commits being merged; prepare
257 # the standard merge summary message to be appended to
258 # the given message. If remote is invalid we will die
259 # later in the common codepath so we discard the error
261 merge_name
=$
(for remote
264 done | git fmt-merge-msg
266 merge_msg
="${merge_msg:+$merge_msg$LF$LF}$merge_name"
268 head=$
(git rev-parse
--verify "$head_arg"^
0) || usage
270 # All the rest are remote heads
271 test "$#" = 0 && usage
;# we need at least one remote head.
272 set_reflog_action
"merge $*"
277 remotehead
=$
(git rev-parse
--verify "$remote"^
0 2>/dev
/null
) ||
278 die
"$remote - not something we can merge"
279 remoteheads
="${remoteheads}$remotehead "
280 eval GITHEAD_
$remotehead='"$remote"'
281 export GITHEAD_
$remotehead
283 set x
$remoteheads ; shift
285 case "$use_strategies" in
289 var
="`git config --get pull.twohead`"
292 use_strategies
="$var"
294 use_strategies
="$default_twohead_strategies"
297 var
="`git config --get pull.octopus`"
300 use_strategies
="$var"
302 use_strategies
="$default_octopus_strategies"
308 for s
in $use_strategies
310 for ss
in $no_fast_forward_strategies
319 for ss
in $no_trivial_strategies
323 allow_trivial_merge
=f
332 common
=$
(git merge-base
--all $head "$@")
335 common
=$
(git show-branch
--merge-base $head "$@")
338 echo "$head" >"$GIT_DIR/ORIG_HEAD"
340 case "$allow_fast_forward,$#,$common,$no_commit" in
342 # No common ancestors found. We need a real merge.
345 # If head can reach all the merge then we are up to date.
346 # but first the most common case of merging one remote.
347 finish_up_to_date
"Already up-to-date."
351 # Again the most common case of merging one remote.
352 echo "Updating $(git rev-parse --short $head)..$(git rev-parse --short $1)"
353 git update-index
--refresh 2>/dev
/null
355 if test -n "$have_message"
357 msg
="$msg (no commit created; -m option ignored)"
359 new_head
=$
(git rev-parse
--verify "$1^0") &&
360 git read-tree
-v -m -u --exclude-per-directory=.gitignore
$head "$new_head" &&
361 finish
"$new_head" "$msg" ||
exit
366 # We are not doing octopus and not fast forward. Need a
370 # We are not doing octopus, not fast forward, and have only
372 git update-index
--refresh 2>/dev
/null
373 case "$allow_trivial_merge" in
375 # See if it is really trivial.
376 git var GIT_COMMITTER_IDENT
>/dev
/null ||
exit
377 echo "Trying really trivial in-index merge..."
378 if git read-tree
--trivial -m -u -v $common $head "$1" &&
379 result_tree
=$
(git write-tree
)
383 printf '%s\n' "$merge_msg" |
384 git commit-tree
$result_tree -p HEAD
-p "$1"
386 finish
"$result_commit" "In-index merge"
394 # An octopus. If we can reach all the remote we are up to date.
398 common_one
=$
(git merge-base
--all $head $remote)
399 if test "$common_one" != "$remote"
405 if test "$up_to_date" = t
407 finish_up_to_date
"Already up-to-date. Yeeah!"
413 # We are going to make a new commit.
414 git var GIT_COMMITTER_IDENT
>/dev
/null ||
exit
416 # At this point, we need a real merge. No matter what strategy
417 # we use, it would operate on the index, possibly affecting the
418 # working tree, and when resolved cleanly, have the desired tree
419 # in the index -- this means that the index must be in sync with
420 # the $head commit. The strategies are responsible to ensure this.
422 case "$use_strategies" in
424 # Stash away the local changes so that we can try more than one.
429 rm -f "$GIT_DIR/MERGE_STASH"
434 result_tree
= best_cnt
=-1 best_strategy
= wt_strategy
=
436 for strategy
in $use_strategies
438 test "$wt_strategy" = '' ||
{
439 echo "Rewinding the tree to pristine..."
442 case "$single_strategy" in
444 echo "Trying merge strategy $strategy..."
448 # Remember which strategy left the state in the working tree
449 wt_strategy
=$strategy
451 git-merge-
$strategy $common -- "$head_arg" "$@"
453 if test "$no_commit" = t
&& test "$exit" = 0
456 exit=1 ;# pretend it left conflicts.
459 test "$exit" = 0 ||
{
461 # The backend exits with 1 when conflicts are left to be resolved,
462 # with 2 when it does not handle the given merge at all.
464 if test "$exit" -eq 1
467 git diff-files --name-only
468 git ls-files --unmerged
470 if test $best_cnt -le 0 -o $cnt -le $best_cnt
472 best_strategy
=$strategy
479 # Automerge succeeded.
480 result_tree
=$
(git write-tree
) && break
483 # If we have a resulting tree, that means the strategy module
484 # auto resolved the merge cleanly.
485 if test '' != "$result_tree"
487 if test "$allow_fast_forward" = "t"
489 parents
=$
(git show-branch
--independent "$head" "$@")
491 parents
=$
(git rev-parse
"$head" "$@")
493 parents
=$
(echo "$parents" |
sed -e 's/^/-p /')
494 result_commit
=$
(printf '%s\n' "$merge_msg" | git commit-tree
$result_tree $parents) ||
exit
495 finish
"$result_commit" "Merge made by $wt_strategy."
500 # Pick the result from the best strategy and have the user fix it up.
501 case "$best_strategy" in
504 case "$use_strategies" in
506 echo >&2 "No merge strategy handled the merge."
509 echo >&2 "Merge with strategy $use_strategies failed."
515 # We already have its result in the working tree.
518 echo "Rewinding the tree to pristine..."
520 echo "Using the $best_strategy to prepare resolving by hand."
521 git-merge-
$best_strategy $common -- "$head_arg" "$@"
525 if test "$squash" = t
532 done >"$GIT_DIR/MERGE_HEAD"
533 printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
536 if test "$merge_was_ok" = t
539 "Automatic merge went well; stopped before committing as requested"
546 git ls-files
--unmerged |
547 sed -e 's/^[^ ]* / /' |
549 } >>"$GIT_DIR/MERGE_MSG"
551 die
"Automatic merge failed; fix conflicts and then commit the result."