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:
commit
de61e42b53
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user