diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-05-01 22:11:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-05-01 22:11:57 -0700 |
commit | a8816e7bab0354badd915c1da09421a64c982831 (patch) | |
tree | 4d481c55f29d977384f312646c84b0adb4ad0d4b /builtin-merge.c | |
parent | 1087aba86b4a687cabf03d4a060d4b51282819d3 (diff) | |
parent | a91be3fcbe92c24e809b1ec85881a6da40a9a340 (diff) | |
download | git-a8816e7bab0354badd915c1da09421a64c982831.tar.gz |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Fixes for Mac OS X TkAqua
git-gui: Update Russian translation
git-gui: run post-checkout hook after clone
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
git-gui (Win): make starting via "Git GUI Here" on .git/ possible
git-gui (Win): make "Explore Working Copy" more robust
git-gui: run post-checkout hook on checkout
git-gui: When calling post-commit hook wrong variable was cleared.
git-gui: use `git --html-path` to get the location of installed HTML docs
git-gui: fix deleting from the context menu with empty selection
git-gui: minor spelling fix and string factorisation.
git-gui: various French translation fixes
git-gui: Fix merge conflict display error when filename contains spaces
git-gui: don't hide the Browse button when resizing the repo chooser
Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
git-gui: Support more git version notations.
git-gui: Avoid an infinite rescan loop in handle_empty_diff.
git-gui: Fix post-commit status with subject in non-locale encoding
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions