Skip to main content

Browse the archive

Staging
v0.8.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 497171e765b7b4f903d21379bee050380e539cf3 authored by Peter Eriksen on 24 January 2007, 19:54:46 UTC, committed by Junio C Hamano on 24 January 2007, 23:32:52 UTC 
Documentation: --amend cannot be combined with -c/-C/-F.
 
We used to get the following confusing error message:

    $ git commit --amend -a -m foo
    Option -m cannot be combined with -c/-C/-F

This is because --amend cannot be combined with -c/-C/-F, which makes
sense, because they try to handle the same log message in different ways.
So update the documentation to reflect this.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 191453f
Raw File
Tip revision: 497171e765b7b4f903d21379bee050380e539cf3 authored by Peter Eriksen on 24 January 2007, 19:54:46 UTC
Documentation: --amend cannot be combined with -c/-C/-F.
Tip revision: 497171e
git-merge-resolve.sh 
#!/bin/sh
#
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2005 Junio C Hamano
#
# Resolve two trees, using enhancd multi-base read-tree.

# The first parameters up to -- are merge bases; the rest are heads.
bases= head= remotes= sep_seen=
for arg
do
	case ",$sep_seen,$head,$arg," in
	*,--,)
		sep_seen=yes
		;;
	,yes,,*)
		head=$arg
		;;
	,yes,*)
		remotes="$remotes$arg "
		;;
	*)
		bases="$bases$arg "
		;;
	esac
done

# Give up if we are given more than two remotes -- not handling octopus.
case "$remotes" in
?*' '?*)
	exit 2 ;;
esac

# Give up if this is a baseless merge.
if test '' = "$bases"
then
	exit 2
fi

git-update-index --refresh 2>/dev/null
git-read-tree -u -m --aggressive $bases $head $remotes || exit 2
echo "Trying simple merge."
if result_tree=$(git-write-tree  2>/dev/null)
then
	exit 0
else
	echo "Simple merge failed, trying Automatic merge."
	if git-merge-index -o git-merge-one-file -a
	then
		exit 0
	else
		exit 1
	fi
fi
back to top