diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:45:05 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:45:05 -0400 |
| commit | de61e42b539ffbd28d2a2ba827bb0eb79767057b (patch) | |
| tree | f5be9d09e5a0b93748619c3da8a06309ea30bef3 /git-am.sh | |
| parent | e75c55844fd0ff96d00173574b1e49cc472ca928 (diff) | |
| parent | 076d7aa5d406fea1a5dedff5e2c54e2716528222 (diff) | |
| download | git-de61e42b539ffbd28d2a2ba827bb0eb79767057b.tar.gz git-de61e42b539ffbd28d2a2ba827bb0eb79767057b.tar.xz | |
Merge branch 'jc/am-quiet'
* jc/am-quiet:
git-am: fix typo in the previous one.
git-am: make the output quieter.
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 |