Jidanni wrote:
for i in RELEASE-NOTES-*
do
echo $i diff:
svn diff -r ${BASE-BASE}:HEAD $i|wdiff -d -3|tee
/tmp/mediawikiDiff$$
done
To achieve that you will have to fetch objects and references from
the remote repository without changing anything locally. Then run
the difference between the objects.
First find out the repository name with 'git remote':
$ git remote
origin
$
When cloning a repository, 'origin' is the default name.
Fetch objects from the repository:
$ git fetch origin
remote: Counting objects: 37, done
remote: Finding sources: 100% (22/22)
remote: Total 22 (delta 13), reused 17 (delta 13)
Unpacking objects: 100% (22/22), done.
From ssh://to/some/path/there
81e98d4..858cf92 master -> origin/master
$
Now that you have all objects from the remote repository, you
can locally do a difference using 'git diff'. The syntax being:
git diff <localbranch>..<remote>/<remotebranch> [somefile]
So that would be:
git diff master..origin/master
The 'git diff' command supports various options, one of them
being word diff so you can probably skip the widff utility.
git diff master..origin/master --word-diff=color
To sum it up:
git fetch origin
git diff master..origin/master \
--word-diff=plain \
--color=never \
RELEASE-NOTES-1.20
If your terminal supports color just --word-diff=color
--
Antoine "hashar" Musso
_______________________________________________
Wikitech-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l
