equal
deleted
inserted
replaced
4 $ echo "autocrlf = false" >> $HOME/.gitconfig |
4 $ echo "autocrlf = false" >> $HOME/.gitconfig |
5 $ echo "[core]" >> $HOME/.gitconfig |
5 $ echo "[core]" >> $HOME/.gitconfig |
6 $ echo "autocrlf = false" >> $HOME/.gitconfig |
6 $ echo "autocrlf = false" >> $HOME/.gitconfig |
7 $ echo "[extensions]" >> $HGRCPATH |
7 $ echo "[extensions]" >> $HGRCPATH |
8 $ echo "convert=" >> $HGRCPATH |
8 $ echo "convert=" >> $HGRCPATH |
9 $ echo 'hgext.graphlog =' >> $HGRCPATH |
|
10 $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
9 $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
11 $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
10 $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
12 $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE |
11 $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE |
13 $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
12 $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
14 $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
13 $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
112 $ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null |
111 $ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null |
113 $ commit -m 'Discard change to foo' |
112 $ commit -m 'Discard change to foo' |
114 $ cd .. |
113 $ cd .. |
115 $ glog() |
114 $ glog() |
116 > { |
115 > { |
117 > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
116 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
118 > } |
117 > } |
119 $ splitrepo() |
118 $ splitrepo() |
120 > { |
119 > { |
121 > msg="$1" |
120 > msg="$1" |
122 > files="$2" |
121 > files="$2" |