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

Make default merge messages denser.

Browse Source 
In particular, make them readable on one line since that's what all the
tools like git-shortlog and gitk end up showing.
This commit is contained in:
Linus Torvalds
2005-06-08 10:09:41 -07:00
parent 4e7346735a
commit 5b1ea09de1
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-pull-script
View File

@ -6,9 +6,7 @@ merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD merge_head=HEAD
if [ "$2" ] if [ "$2" ]
then then
merge_name="'$2' branch from merge_name="'$2' branch of $merge_name"
$merge_name"
merge_head="refs/heads/$2" merge_head="refs/heads/$2"
fi fi

3
git-resolve-script
View File

@ -43,7 +43,7 @@ if [ "$common" == "$head" ]; then
fi fi
echo "Trying to merge $merge into $head" echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1 git-read-tree -u -m $common $head $merge || exit 1
merge_msg="Merge of $merge_repo" merge_msg="Merge $merge_repo"
result_tree=$(git-write-tree 2> /dev/null) result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge" echo "Simple merge failed, trying Automatic merge"
@ -52,7 +52,6 @@ if [ $? -ne 0 ]; then
echo "Automatic merge failed, fix up by hand" echo "Automatic merge failed, fix up by hand"
exit 1 exit 1
fi fi
merge_msg="Automatic merge of $merge_repo"
result_tree=$(git-write-tree) || exit 1 result_tree=$(git-write-tree) || exit 1
fi fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)