From: Junio C Hamano Date: Sat, 6 Sep 2008 23:47:32 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.6.1-rc1~271 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e;p=git.git Merge branch 'maint' * 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 --- 4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e