diff options
| author | Jeff King <peff@peff.net> | 2012-10-24 07:31:37 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-24 07:31:37 (GMT) |
| commit | afb85c76b2283b7689c69efabee7fe1719c385db (patch) | |
| tree | 763c54929b1dd563d5fd7fc2298f49e3491a9232 /Reintegrate | |
| parent | 30f4c66e634760a81ab27a236fe1f2482f6f7856 (diff) | |
| download | git-afb85c76b2283b7689c69efabee7fe1719c385db.zip git-afb85c76b2283b7689c69efabee7fe1719c385db.tar.gz git-afb85c76b2283b7689c69efabee7fe1719c385db.tar.bz2 | |
Reintegrate: use --no-decorate with log --oneline
Otherwise, the script gets confused and gives us a "Huh?"
line when log.decorate is set.
Diffstat (limited to 'Reintegrate')
| -rwxr-xr-x | Reintegrate | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Reintegrate b/Reintegrate index 17299f9..2a8b0cc 100755 --- a/Reintegrate +++ b/Reintegrate @@ -182,7 +182,7 @@ generate () { echo " exec $PROGRAM" '"$1" "$0"' echo 'esac' echo "$PROGRAM" '"$@" <<\EOF' - git log --pretty=oneline --first-parent "$1" | + git log --no-decorate --pretty=oneline --first-parent "$1" | { series= while read commit msg |