diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-27 22:55:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-27 22:55:37 +0100 |
| commit | 4096958aab6f83302dd00f19d2bd500ae75e8c29 (patch) | |
| tree | c231a97c24ca3b7653fa0542bcfe90f141f1d1e9 /merge-tree.c | |
| parent | Update draft release notes to 1.6.6 (diff) | |
| parent | git-gui: adjust the minimum height of diff pane for shorter screen height (diff) | |
| download | git-4096958aab6f83302dd00f19d2bd500ae75e8c29.tar.xz git-4096958aab6f83302dd00f19d2bd500ae75e8c29.zip | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: adjust the minimum height of diff pane for shorter screen height
git-gui: fix use of uninitialized variable
git-gui: store wm state and fix wm geometry
git-gui: Ensure submodule path is quoted properly
git-gui: fix diff for partially staged submodule changes
git-gui: Update russian translation
git-gui: Limit display to a maximum number of files
git-gui: remove warning when deleting correctly merged remote branch
git-gui: Added Greek translation & glossary
git-gui: display summary when showing diff of a submodule
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions