Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 6 Sep 2008 23:47:32 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 6 Sep 2008 23:47:32 +0000 (16:47 -0700)
* maint:
Update draft release notes for 1.6.0.2
stash: refresh the index before deciding if the work tree is dirty
Mention the fact that 'git annotate' is only for backward compatibility.
"blame -c" should be compatible with "annotate"
git-gui: Fix diff parsing for lines starting with "--" or "++"
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line
git-gui: update all remaining translations to French.
git-gui: Update french translation

1  2 
builtin-blame.c
diff --cc builtin-blame.c
Simple merge