Ignore:
Timestamp:
Jan 29, 2019, 1:40:09 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
6a9d4b4
Parents:
cde3891 (diff), ede87c6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/PrettyGitLogs.sh

    rcde3891 ra200795  
    33set -e
    44
    5 GIT_UPDATE="$1/GIT_UPDATE"
    6 GIT_LOG="$1/GIT_LOG"
    7 GIT_DIFF="$1/GIT_DIFF"
     5GIT="git --git-dir=$1/.git"
     6
     7GIT_UPDATE="$2/GIT_UPDATE"
     8GIT_LOG="$2/GIT_LOG"
     9GIT_DIFF="$2/GIT_DIFF"
    810
    911rm -f ${GIT_UPDATE}  ${GIT_LOG}  ${GIT_DIFF}
    1012
    11 GitOldRef=$2
    12 GitNewRef=$3
     13GitOldRef=$3
     14GitNewRef=$4
    1315
    1416
Note: See TracChangeset for help on using the changeset viewer.