user/sven/git.git/git-gui, branch v1.5.0.2

Merge git://repo.or.cz/git-gui into maint

2007-02-25T07:33:12Z

* git://repo.or.cz/git-gui: Don't modify CREDITS-FILE if it hasn't changed.

Merge branch 'master' of git://repo.or.cz/git-gui into maint

2007-02-21T19:09:57Z

* '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-gui

2007-02-13T21:48:52Z

* 'master' of git://repo.or.cz/git-gui: git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"

Merge branch 'master' of git://repo.or.cz/git-gui

2007-02-13T00:07:29Z

* '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-gui

2007-02-12T07:04:00Z

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

git-gui: Modified makefile to embed version into git-gui script.

2007-01-21T07:54:18Z

We want to embed the version of git-gui directly into the script file, so that we can display it properly in the about dialog. Consequently I've refactored the Makefile process to act like the one in core git.git with regards to shell scripts, allowing git-gui to be constructed by a sed replacement performed on git-gui.sh. Signed-off-by: Shawn O. Pearce

git-gui: Hide the ugly bash command line from the windows desktop icon.

2007-01-21T07:54:18Z

The user really doesn't need to see the technical details of how we launch git-gui from within their "desktop icon". Instead we should hide the command line from being displayed when the icon launches by putting @ at the start of the line. If they really need to see the command we are running they can edit the batch file. Signed-off-by: Shawn O. Pearce

git-gui: Change more 'include' language to 'add'.

2007-01-21T07:54:17Z

I just found a whole slew of places where we still were using the term 'include' rather than 'add' to refer to the act of updating the index with modifications from the working directory. To be consistent with all Git documentation and command line tools, these should be 'add'. Signed-off-by: Shawn O. Pearce

git-gui: Work around odd cygpath bug on Windows.

2007-01-21T07:54:17Z

There appears to be a bug on one of my test systems where cygpath with the --long-name option is generating a corrupt string that does not actually refer to sh.exe. This breaks any desktop icon created by git-gui as the executable we are trying to invoke does not exist. Since Cygwin is typically installed as C:\cygwin long path names is probably not actually necessary to link to the shell. I also added a small echo to the start of the icon script, as it can take one of my test systems several seconds to startup git-gui. This way the user knows we're starting git-gui, and was politely asked to wait for the action to complete. Signed-off-by: Shawn O. Pearce

git-gui: Correct wording of the revert confirmation dialog.

2007-01-21T07:54:16Z

We no longer describe updating the index as including changes, as we now use the add notation used by core Git's command line tools. So its confusing to be talking about unincluded changes within the revert dialog. Instead we should used language like 'unadded changes'. Signed-off-by: Shawn O. Pearce