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.
1
2
git-am.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
e75c558
076d7aa
)
diff --combined
git-am.sh
index b02ae6a76fa8265da1ea3d720df9dc29cc5d5519,cfa6fcf0af01e6b6c9e3a3a909d88b500aa25365..2514d07de2ea89598499a35e3e4a2fcc9096bbec
---
1
/
git-am.sh
---
2
/
git-am.sh
+++ b/
git-am.sh
@@@
-394,9
-394,7
+394,7
@@@
d
stop_here $this
fi
- echo
printf 'Applying %s\n' "$SUBJECT"
- echo
case "$resolved" in
'')
@@@
-452,10
-450,8
+450,8
@@@
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
@@@
-464,8
-460,6
+460,8
@@@
"$GIT_DIR"/hooks/post-applypatch
fi
+ git gc --auto
+
go_next
done