diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-01 22:31:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-01 22:31:46 -0700 |
commit | f6576f4c0c6fa3b2d979faf28936c09480dedaab (patch) | |
tree | 26bb4d7d46d6e67a050eaa467e88e1a251ee309a /Documentation/gitattributes.txt | |
parent | Merge branch 'maint' (diff) | |
parent | git-gui: Update German translation. (diff) | |
download | tgif-f6576f4c0c6fa3b2d979faf28936c09480dedaab.tar.xz |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: (27 commits)
git-gui: Update German translation.
git-gui: Do not munge conflict marker lines in a normal diff
git-gui: Add a simple implementation of SSH_ASKPASS.
git-gui: Add a dialog that shows the OpenSSH public key.
git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
git-gui: Show a round number of bytes of large untracked text files
git-gui: Fix the blame viewer destroy handler.
git-gui: Add a search command to the blame viewer.
git-gui: Fix the blame window shape.
git-gui: Fix switch statement in lib/merge.tcl
git-gui: Fix fetching from remotes when adding them
git-gui: Fix removing non-pushable remotes
git-gui: Make input boxes in init/clone/open dialogs consistent
git-gui: Avoid using the term URL when specifying repositories
git-gui: gui.autoexplore makes explorer to pop up automatically after picking
git-gui: Add Explore Working Copy to the Repository menu
git-gui: Use git web--browser for web browsing
git-gui: mkdir -p when initializing new remote repository
git-gui: Add support for removing remotes
git-gui: Add support for adding remotes
...
Diffstat (limited to 'Documentation/gitattributes.txt')
0 files changed, 0 insertions, 0 deletions