summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add option to find zlib in custom pathRobert Schiele2007-07-312-1/+10
* Unset GIT_EDITOR while running tests.Junio C Hamano2007-07-301-0/+1
* add_file_to_index: skip rehashing if the cached stat already matchesJunio C Hamano2007-07-301-1/+10
* git-svn: Translate invalid characters in refnameRobert Ewald2007-07-301-3/+36
* white space fixes in setup.cJohannes Schindelin2007-07-301-3/+3
* Documentation/gitattributes.txt: typofixDavid Soria Parra2007-07-301-1/+1
* rebase: try not to munge commit log messageJunio C Hamano2007-07-292-5/+72
* symbolic-ref, update-ref: do not refuse reflog message with LFJunio C Hamano2007-07-292-4/+0
* log_ref_write() -- do not chomp reflog message at the first LFJunio C Hamano2007-07-291-16/+28
* Merge branch 'bs/lock'Junio C Hamano2007-07-293-26/+135
|\
| * Add test for symlinked configuration file updates.Junio C Hamano2007-07-271-0/+15
| * use lockfile.c routines in git_commit_set_multivar()Bradford C. Smith2007-07-271-12/+18
| * fully resolve symlinks when creating lockfilesBradford C. Smith2007-07-271-14/+102
* | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-07-2913-428/+1132
|\ \
| * | git-gui: Minor refactoring of merge command line in merge supportgitgui-0.8.0Shawn O. Pearce2007-07-291-3/+3
| * | git-gui: Use more modern looking icons in the tree browserShawn O. Pearce2007-07-292-30/+18
| * | git-gui: Don't offer to stage hunks from untracked filesShawn O. Pearce2007-07-291-0/+6
| * | git-gui: Make sure remotes are loaded when picking revisionsShawn O. Pearce2007-07-291-0/+4
| * | git-gui: Use progress bar while resetting/aborting filesShawn O. Pearce2007-07-291-4/+12
| * | git-gui: Honor core.excludesfile when listing extra filesShawn O. Pearce2007-07-291-0/+4
| * | git-gui: Unify wording to say "to stage" instead of "to add"Christian Stimming2007-07-295-14/+18
| * | git-gui: Don't kill modified commit message buffer with merge templatesShawn O. Pearce2007-07-271-2/+3
| * | git-gui: Remove usernames from absolute SSH urls during mergingShawn O. Pearce2007-07-251-0/+3
| * | git-gui: Format tracking branch merges as though they were pullsShawn O. Pearce2007-07-251-4/+28
| * | git-gui: Cleanup bindings within merge dialogShawn O. Pearce2007-07-251-5/+9
| * | git-gui: Replace merge dialog with our revision picker widgetShawn O. Pearce2007-07-251-70/+11
| * | git-gui: Show ref last update times in revision chooser tooltipsShawn O. Pearce2007-07-251-1/+33
| * | git-gui: Display commit/tag/remote info in tooltip of revision pickerShawn O. Pearce2007-07-251-6/+230
| * | git-gui: Save remote urls obtained from config/remotes setupShawn O. Pearce2007-07-251-0/+6
| * | git-gui: Avoid unnecessary symbolic-ref call during checkoutShawn O. Pearce2007-07-231-14/+16
| * | git-gui: Refactor current branch menu items to make i18n easierShawn O. Pearce2007-07-231-2/+11
| * | git-gui: Refactor diff popup into a procedure to ease i18n workShawn O. Pearce2007-07-231-9/+11
| * | git-gui: Paper bag fix quitting crash after commitShawn O. Pearce2007-07-231-1/+1
| * | git-gui: Clarify meaning of add tracked menu optionShawn O. Pearce2007-07-231-2/+2
| * | git-gui: Fix unnecessary fast-forward during checkoutShawn O. Pearce2007-07-221-0/+1
| * | git-gui: Completely remove my Tools/Migrate hackShawn O. Pearce2007-07-221-29/+0
| * | git-gui: Internally allow fetch without storing for future pull supportShawn O. Pearce2007-07-211-3/+11
| * | git-gui: Skip unnecessary read-tree work during checkoutShawn O. Pearce2007-07-211-1/+3
| * | git-gui: Simplify error case for unsupported merge typesShawn O. Pearce2007-07-211-1/+1
| * | git-gui: Factor out common fast-forward merge caseShawn O. Pearce2007-07-211-25/+21
| * | git-gui: Save the merge base during checkout_op processingShawn O. Pearce2007-07-211-5/+5
| * | git-gui: Automatically backup the user's commit bufferShawn O. Pearce2007-07-212-11/+81
| * | git-gui: Completely remove support for creating octopus mergesShawn O. Pearce2007-07-191-68/+17
| * | git-gui: Don't show blame tooltips that we have no data forShawn O. Pearce2007-07-191-0/+5
| * | git-gui: Translate standard encoding names to Tcl onesShawn O. Pearce2007-07-193-11/+304
| * | git-gui: Avoid unnecessary global statements when possibleShawn O. Pearce2007-07-191-7/+4
| * | git-gui: Bind Ctrl/Cmd-M to merge actionShawn O. Pearce2007-07-191-2/+4
| * | Don't offer my special Tools/Migrate hack unless in multicommitShawn O. Pearce2007-07-181-1/+3
| * | git-gui: Convert merge dialog to use class systemShawn O. Pearce2007-07-181-41/+65
| * | git-gui: Increase the default height of the revision pickerShawn O. Pearce2007-07-181-1/+1