summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* GIT 1.5.0.2v1.5.0.2Junio C Hamano2007-02-262-12/+18
* git-remote: support remotes with a dot in the namePavel Roskin2007-02-261-1/+1
* Documentation: describe "-f/-t/-m" options to "git-remote add"Junio C Hamano2007-02-251-0/+13
* diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2007-02-252-7/+34
* Merge branch 'jc/merge-symlink' into maintJunio C Hamano2007-02-252-2/+2
|\
| * merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano2007-02-251-1/+1
| * merge-index: fix longstanding bug in merging symlinksJunio C Hamano2007-02-251-1/+1
* | Add Release Notes to prepare for 1.5.0.2Junio C Hamano2007-02-252-1/+60
* | Allow arbitrary number of arguments to git-pack-objectsRoland Dreier2007-02-251-3/+9
* | rerere: do not deal with symlinks.Junio C Hamano2007-02-251-5/+9
* | rerere: do not skip two conflicted paths next to each other.Junio C Hamano2007-02-251-1/+1
* | Merge git://repo.or.cz/git-gui into maintJunio C Hamano2007-02-241-6/+19
|\ \
| * | Don't modify CREDITS-FILE if it hasn't changed.Junio C Hamano2007-02-251-6/+19
* | | diff-patch: Avoid emitting double-slashes in textual patch.Junio C Hamano2007-02-241-2/+4
* | | Reword git-am 3-way fallback failure message.Junio C Hamano2007-02-241-1/+1
* | | Limit filename for format-patchRobin Rosenberg2007-02-241-7/+21
* | | core.legacyheaders: Use the description used in RelNotes-1.5.0Santi BĂ©jar2007-02-241-4/+11
* | | git-show-ref --verify: Fail if called without a referenceDmitry V. Levin2007-02-241-2/+4
* | | git-diff: fix combined diffJohannes Schindelin2007-02-221-1/+2
* | | Fix 'git commit -a' in a newly initialized repositoryFredrik Kuivinen2007-02-221-0/+4
* | | Include git-gui credits file in dist.Shawn O. Pearce2007-02-211-1/+2
* | | Document the new core.bare configuration option.Shawn O. Pearce2007-02-211-0/+12
* | | Merge branch 'master' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-02-216-120/+308
|\ \ \ | |/ /
| * | git-gui: Don't crash in citool mode on initial commit.gitgui-0.6.1Shawn O. Pearce2007-02-211-8/+8
| * | git-gui: Remove TODO list.Shawn O. Pearce2007-02-211-44/+0
| * | git-gui: Include browser in our usage message.Shawn O. Pearce2007-02-211-1/+1
| * | git-gui: Change summary of git-gui.Shawn O. Pearce2007-02-211-1/+1
| * | git-gui: Display all authors of git-gui.Shawn O. Pearce2007-02-214-10/+136
| * | git-gui: Use mixed path for docs on Cygwin.Shawn O. Pearce2007-02-211-1/+1
| * | git-gui: Correct crash when saving options in blame mode.Shawn O. Pearce2007-02-181-15/+21
| * | git-gui: Expose the browser as a subcommand.Shawn O. Pearce2007-02-161-5/+21
| * | git-gui: Create new branches from a tag.Martin Koegler2007-02-151-0/+30
| * | git-gui: Prefer version file over git-describe.Shawn O. Pearce2007-02-141-6/+11
| * | git-gui: Print version on the console.Shawn O. Pearce2007-02-141-0/+7
| * | git-gui: More consistently display the application name.Shawn O. Pearce2007-02-141-4/+4
| * | git-gui: Permit merging tags into the current branch.Shawn O. Pearce2007-02-131-3/+5
| * | git-gui: Basic version check to ensure git 1.5.0 or later is used.Shawn O. Pearce2007-02-131-0/+32
| * | git-gui: Refactor 'exec git subcmd' idiom.Shawn O. Pearce2007-02-131-23/+31
* | | Use gunzip -c over gzcat in import-tars example.Michael Loeffler2007-02-211-3/+6
* | | Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.Jason Riedy2007-02-201-21/+16
* | | Obey NO_C99_FORMAT in fast-import.c.Jason Riedy2007-02-191-14/+23
* | | Add a compat/strtoumax.c for Solaris 8.Jason Riedy2007-02-193-0/+28
* | | git-clone: Sync documentation to usage note.Christian Schlotter2007-02-192-3/+3
* | | GIT 1.5.0.1v1.5.0.1Junio C Hamano2007-02-183-8/+13
* | | Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingFredrik Kuivinen2007-02-181-6/+6
* | | Read the config in rev-listFredrik Kuivinen2007-02-181-0/+1
* | | Update draft release notes for 1.5.0.1Junio C Hamano2007-02-171-2/+19
* | | Merge git://git.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano2007-02-170-0/+0
|\ \ \
| * | | Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl2007-02-151-10/+13
| * | | Make gitk save and restore the user set window position.Mark Levedahl2007-02-151-5/+6