git/git-gui/Makefile, branch v1.5.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://www.git.shady.money/git/atom?h=v1.5.22007-05-17T23:52:45ZMerge branch 'master' of git://repo.or.cz/git-gui2007-05-17T23:52:45ZJunio C Hamanojunkio@cox.net2007-05-17T23:52:45Zurn:sha1:e986e26a86616054f96373280e8f9cc89d7ea8ca
* 'master' of git://repo.or.cz/git-gui:
git-gui: Gracefully handle bad TCL_PATH at compile time
Merge branch 'master' of git://repo.or.cz/git-gui2007-05-10T22:08:18ZJunio C Hamanojunkio@cox.net2007-05-10T22:08:18Zurn:sha1:2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5
* 'master' of git://repo.or.cz/git-gui:
git gui 0.7.0
git-gui: Paperbag fix blame in subdirectory
git-gui: Format author/committer times in ISO format
git-gui: Cleanup minor nits in blame code
git-gui: Generate blame on uncommitted working tree file
git-gui: Smarter command line parsing for browser, blame
git-gui: Use prefix if blame is run in a subdirectory
git-gui: Convert blame to the "class" way of doing things
git-gui: Don't attempt to inline array reads in methods
git-gui: Convert browser, console to "class" format
git-gui: Define a simple class/method system
git-gui: Allow shift-{k,j} to select a range of branches to merge
git-gui: Call changes "Staged" and "Unstaged" in file list titles.
Merge branch 'master' of git://repo.or.cz/git-gui2007-05-08T03:51:00ZShawn O. Pearcespearce@spearce.org2007-05-08T03:36:31Zurn:sha1:5f5dbd719d0d8ec136f32a0a56674902bd85f72f
* 'master' of git://repo.or.cz/git-gui:
git-gui: Use vi-like keys in merge dialog
git-gui: Include commit id/subject in merge choices
git-gui: Show all possible branches for merge
git-gui: Move merge support into a namespace
git-gui: Allow vi keys to scroll the diff/blame regions
git-gui: Move console procs into their own namespace
git-gui: Refactor into multiple files to save my sanity
git-gui: Track our own embedded values and rebuild when they change
git-gui: Refactor to use our git proc more often
git-gui: Use option database defaults to set the font
git-gui: Cleanup common font handling for font_ui
git-gui: Correct line wrapping for too many branch message
git-gui: Warn users before making an octopus merge
git-gui: Include the subject in the status bar after commit
Also perform an evil merge change to update Git's main Makefile to
pass the proper options down into git-gui now that it depends on
reasonable values for 'sharedir' and 'TCL_PATH'.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Merge branch 'master' of git://repo.or.cz/git-gui2007-04-18T00:16:56ZJunio C Hamanojunkio@cox.net2007-04-18T00:16:56Zurn:sha1:c182ec90d824168cfb70494bb920c0a2fb590d98
* 'master' of git://repo.or.cz/git-gui:
git-gui: Honor TCLTK_PATH if supplied
Revert "Allow wish interpreter to be defined with TCLTK_PATH"
git-gui: Display the directory basename in the title
git-gui: Brown paper bag fix division by 0 in blame
Always bind the return key to the default button
Do not break git-gui messages into multiple lines.
Improve look-and-feel of the git-gui tool.
Teach git-gui to use the user-defined UI font everywhere.
Allow wish interpreter to be defined with TCLTK_PATH
Merge branch 'master' of git://repo.or.cz/git-gui2007-03-13T06:14:07ZJunio C Hamanojunkio@cox.net2007-03-13T06:14:07Zurn:sha1:27ebd6e0443bdd795869f598ecebc9eadd64a26c
* 'master' of git://repo.or.cz/git-gui:
git-gui: Support of "make -s" in: do not output anything of the build itself
Merge branch 'maint' of git://repo.or.cz/git-gui into maint2007-03-12T18:43:22ZJunio C Hamanojunkio@cox.net2007-03-12T18:43:22Zurn:sha1:3ed02de2f46105cbc45fcc8f3287513f470eb4a3
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Allow 'git gui version' outside of a repository
git-gui: Revert "git-gui: Display all authors of git-gui."
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
git-gui: Allow committing empty merges
Merge branch 'master' of git://repo.or.cz/git-gui into maint2007-03-06T08:39:52ZJunio C Hamanojunkio@cox.net2007-03-06T08:39:52Zurn:sha1:eec102524fda2df7d2846e865805ca213119bf10
* 'master' of git://repo.or.cz/git-gui:
git-gui: Make 'make' quieter by default
git-gui: Remove unnecessary /dev/null redirection.
git-gui: Don't create empty (same tree as parent) commits.
git-gui: Add Reset to the Branch menu.
git-gui: Relocate the menu/transport menu code.
Merge branch 'master' of git://repo.or.cz/git-gui into maint2007-02-21T19:09:57ZJunio C Hamanojunkio@cox.net2007-02-21T19:09:57Zurn:sha1:5bac4a671907604b5fb4e24ff682d5b0e8431931
* 'master' of git://repo.or.cz/git-gui:
git-gui: Don't crash in citool mode on initial commit.
git-gui: Remove TODO list.
git-gui: Include browser in our usage message.
git-gui: Change summary of git-gui.
git-gui: Display all authors of git-gui.
git-gui: Use mixed path for docs on Cygwin.
git-gui: Correct crash when saving options in blame mode.
git-gui: Expose the browser as a subcommand.
git-gui: Create new branches from a tag.
git-gui: Prefer version file over git-describe.
git-gui: Print version on the console.
git-gui: More consistently display the application name.
git-gui: Permit merging tags into the current branch.
git-gui: Basic version check to ensure git 1.5.0 or later is used.
git-gui: Refactor 'exec git subcmd' idiom.
Merge branch 'master' of git://repo.or.cz/git-gui2007-02-13T00:07:29ZJunio C Hamanojunkio@cox.net2007-02-13T00:07:29Zurn:sha1:67c7575947b06a2a9bbdb355357895149bdbd8e5
* 'master' of git://repo.or.cz/git-gui:
git-gui: Change base version to 0.6.
git-gui: Guess our version accurately as a subproject.
git-gui: Handle gitgui tags in version gen.
git-gui: Generate a version file on demand.
git-gui: Rename GIT_VERSION to GITGUI_VERSION.
git-gui: Allow gitexecdir, INSTALL to be set by the caller.
Merge git-gui2007-02-12T07:04:00ZJunio C Hamanojunkio@cox.net2007-02-12T07:04:00Zurn:sha1:b4d2b04c9b6dc42c0bcf0513b9d8f731ec26db82
This merges git-gui project of Shawn as a subproject of git.git
at git-gui/ subdirectory.
This merge only melds two histories together. The toplevel Makefile
does not even know about git-gui yet.
Signed-off-by: Junio C Hamano <junkio@cox.net>