1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 21:07:52 +01:00

Merge branch 'jc/am-quiet'

* jc/am-quiet:
  git-am: fix typo in the previous one.
  git-am: make the output quieter.
This commit is contained in:
Shawn O. Pearce 2007-10-18 03:45:05 -04:00
commit de61e42b53

View file

@ -394,9 +394,7 @@ do
stop_here $this
fi
echo
printf 'Applying %s\n' "$SUBJECT"
echo
case "$resolved" in
'')
@ -452,10 +450,8 @@ do
fi
tree=$(git write-tree) &&
echo Wrote tree $tree &&
parent=$(git rev-parse --verify HEAD) &&
commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
echo Committed: $commit &&
git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
stop_here $this