| commit | bec0aa7310835e202f4e700db15a956ac04c87c2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Jun 2013 18:01:24 +0000 (17 11:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Jun 2013 18:01:24 +0000 (17 11:01 -0700) | ||
| tree | 1a002b1c11fc6a259af6222d9d9428135d922f70 | treesnapshot (tar.gz zip) |
| parent | 89e0eab725489444e53bcc04babf4705511c99af | commitdiff |
| parent | fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c | commitdiff |
Merge branch 'master' into next
* master:
git-gui 0.18
git-gui: avoid an error message when removing the last remote
git-gui: fix file name handling with non-empty prefix
git-gui: bring wish process to front on Mac
git-gui: change dialog button positions for Windows to suit platform.
git-gui: allow "\ No newline at end of file" for linewise staging
git-gui: fix the mergetool launcher for the Beyond Compare tool.
Makefile: replace "echo 1>..." with "echo >..."
French translation: copy -> copie.
git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
* master:
git-gui 0.18
git-gui: avoid an error message when removing the last remote
git-gui: fix file name handling with non-empty prefix
git-gui: bring wish process to front on Mac
git-gui: change dialog button positions for Windows to suit platform.
git-gui: allow "\ No newline at end of file" for linewise staging
git-gui: fix the mergetool launcher for the Beyond Compare tool.
Makefile: replace "echo 1>..." with "echo >..."
French translation: copy -> copie.
git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>