Skip to content

Commit

Permalink
Merge branch 'jc/am-quiet'
Browse files Browse the repository at this point in the history
* jc/am-quiet:
  git-am: fix typo in the previous one.
  git-am: make the output quieter.
  • Loading branch information
Shawn O. Pearce committed Oct 18, 2007
2 parents e75c558 + 076d7aa commit de61e42
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,7 @@ do
stop_here $this
fi

echo
printf 'Applying %s\n' "$SUBJECT"
echo

case "$resolved" in
'')
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit de61e42

Please sign in to comment.