diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:47:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:47:32 -0700 |
| commit | 4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e (patch) | |
| tree | e5bfb6f6467031660b19a3afeb51cbd732664342 /builtin-merge-file.c | |
| parent | 80d12c23de4fbddfaee2f9bf7fe809f57d02e171 (diff) | |
| parent | aaefbfa66c348a461b3081873ef42819c8b38dac (diff) | |
| download | git-4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e.tar.gz | |
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
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions