Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/am-quiet'
author
Shawn O. Pearce
<spearce@spearce.org>
Thu, 18 Oct 2007 07:45:05 +0000
(
03:45
-0400)
committer
Shawn O. Pearce
<spearce@spearce.org>
Thu, 18 Oct 2007 07:45:05 +0000
(
03:45
-0400)
* jc/am-quiet:
git-am: fix typo in the previous one.
git-am: make the output quieter.
git-am.sh
patch
|
blob
|
history
raw
(from parent 1:
e75c558
)
diff --git
a/git-am.sh
b/git-am.sh
index b02ae6a76fa8265da1ea3d720df9dc29cc5d5519..2514d07de2ea89598499a35e3e4a2fcc9096bbec 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-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