summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2007-03-14GIT 1.5.0.4v1.5.0.4Junio C Hamano3-2/+26
2007-03-14Clarify doc for git-config --unset-all.Yann Dirson1-1/+1
2007-03-14git-checkout: fix "eval" used for merge labelling.Junio C Hamano1-1/+1
2007-03-13cvsserver: asciidoc formatting changesFrank Lichtenheld1-8/+11
2007-03-12Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano1-2/+2
2007-03-12fast-import: grow tree storage more aggressivelyJeff King1-2/+2
2007-03-12Don't package the git-gui credits file anymoreShawn O. Pearce1-2/+1
2007-03-12Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano4-156/+15
2007-03-12git-gui: Allow 'git gui version' outside of a repositorygitgui-0.6.4Shawn O. Pearce1-7/+5
2007-03-12git-gui: Revert "git-gui: Display all authors of git-gui."Shawn O. Pearce4-135/+9
2007-03-12git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."Shawn O. Pearce1-19/+6
2007-03-12git-gui: Allow committing empty mergesShawn O. Pearce1-1/+1
2007-03-11git-send-email: Document configuration optionsAvi Kivity1-0/+13
2007-03-11git-merge: warn when -m provided on a fast forwardJ. Bruce Fields1-1/+6
2007-03-10git.el: Retrieve commit log information from .dotest directory.Alexandre Julliard1-24/+53
2007-03-10git.el: Avoid appending a signoff line that is already present.Alexandre Julliard1-6/+18
2007-03-10setup_git_directory_gently: fix off-by-one errorMatthias Lederhofer1-1/+1
2007-03-10Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano3-20/+29
2007-03-10user-manual: install user manual stylesheet with other web documentsJ. Bruce Fields1-1/+1
2007-03-10user-manual: fix rendering of history diagramsJ. Bruce Fields1-4/+21
2007-03-10user-manual: fix missing colon in git-show exampleJ. Bruce Fields1-1/+1
2007-03-10user-manual: fix inconsistent use of pull and mergeJ. Bruce Fields1-11/+3
2007-03-10user-manual: fix inconsistent exampleJ. Bruce Fields1-2/+2
2007-03-10glossary: fix overoptimistic automatic linking of defined termsJ. Bruce Fields1-1/+1
2007-03-09Documentation: s/seperator/separator/Jeff King1-3/+3
2007-03-09Adjust reflog filemode in shared repositoryMatthias Kestenholz1-0/+2
2007-03-07Catch write_ref_sha1 failure in receive-packShawn O. Pearce1-1/+4
2007-03-06make t8001 work on Mac OS X againJohannes Schindelin1-1/+2
2007-03-06Merge branch 'master' of git://repo.or.cz/git-gui into maintJunio C Hamano2-37/+69
2007-03-06git-gui: Make 'make' quieter by defaultgitgui-0.6.3Shawn O. Pearce1-7/+15
2007-03-05git-commit: cd to top before showing the final statJunio C Hamano1-0/+3
2007-03-05Fix diff-options references in git-diff and git-format-patchBrian Gernhardt2-3/+5
2007-03-05Add definition of <commit-ish> to the main git man page.Theodore Ts'o1-0/+6
2007-03-05Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maintJunio C Hamano1-6/+19
2007-03-05Begin SubmittingPatches with a check listJohannes Schindelin1-0/+27
2007-03-05fast-import: Fail if a non-existant commit is used for mergeShawn O. Pearce1-1/+8
2007-03-05fast-import: Avoid infinite loop after resetShawn O. Pearce1-5/+11
2007-03-04GIT 1.5.0.3v1.5.0.3Junio C Hamano2-12/+15
2007-03-04glossary: Add definitions for dangling and unreachable objectsYasushi SHOJI1-0/+9
2007-03-04user-manual: more detailed merge discussionJ. Bruce Fields1-25/+77
2007-03-04user-manual: how to replace commits older than most recentJ. Bruce Fields1-0/+46
2007-03-04user-manual: insert earlier of mention content-addressable architectureJ. Bruce Fields1-9/+15
2007-03-04user-manual: ensure generated manual references stylesheetJ. Bruce Fields1-1/+4
2007-03-04user-manual: reset to ORIG_HEAD not HEAD to undo mergeJ. Bruce Fields1-1/+1
2007-03-04Documentation: mention module option to git-cvsimportJ. Bruce Fields1-1/+1
2007-03-03Unset NO_C99_FORMAT on Cygwin.Ramsay Jones1-1/+0
2007-03-03Fix a "pointer type missmatch" warning.Ramsay Jones2-2/+15
2007-03-03Fix some "comparison is always true/false" warnings.Ramsay Jones1-4/+6
2007-03-03Fix an "implicit function definition" warning.Ramsay Jones1-0/+6
2007-03-03Fix a "label defined but unreferenced" warning.Ramsay Jones1-0/+2
2007-03-03Document the config variable format.suffixJohannes Schindelin1-0/+5
2007-03-03git-merge: fail correctly when we cannot fast forward.Junio C Hamano1-1/+1
2007-03-03builtin-archive: use RUN_SETUPJohannes Schindelin2-3/+1
2007-03-03Fix git-gc usage noteMatthias Kestenholz1-1/+1
2007-03-02Fix quoting in update hook templateGerrit Pape1-1/+1
2007-03-02Another memory overrun in http-push.cEygene Ryabinkin1-3/+7
2007-03-01fetch.o depends on the headers, too.Johannes Schindelin1-1/+1
2007-03-01Documentation: Correct minor typo in git-add documentation.Christian Schlotter1-1/+1
2007-03-01Documentation/git-send-email.txt: Fix labeled list formattingSergey Vlasov1-6/+6
2007-03-01Documentation/git-quiltimport.txt: Fix labeled list formattingSergey Vlasov1-4/+4
2007-03-01Documentation/build-docdep.perl: Fix dependencies for included asciidoc filesSergey Vlasov1-5/+1
2007-03-01git-gui: Remove unnecessary /dev/null redirection.Shawn O. Pearce1-8/+2
2007-02-28Start preparing Release Notes for 1.5.0.3Junio C Hamano2-1/+56
2007-02-28Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name urlJunio C Hamano1-3/+14
2007-02-28Include config.mak in doc/MakefileUwe Kleine-König1-0/+1
2007-02-28git.el: Set the default commit coding system from the repository config.Alexandre Julliard1-6/+18
2007-02-28git-archimport: support empty summaries, put summary on a single line.Paolo Bonzini1-4/+15
2007-02-28http-push.c::lock_remote(): validate all remote refs.Eygene Ryabinkin1-1/+1
2007-02-28git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.Gerrit Pape1-1/+2
2007-02-27builtin-fmt-merge-msg: fix bugs in --file optionMichael Coleman1-1/+3
2007-02-27index-pack: Loop over pread until data loading is complete.Shawn O. Pearce1-2/+8
2007-02-27blameview: Fix the browse behavior in blameviewAneesh Kumar1-1/+1
2007-02-27Fix minor typos/grammar in user-manual.txtMichael Coleman1-17/+14
2007-02-27Correct ordering in git-cvsimport's option documentationMichael Poole1-5/+4
2007-02-27git-show: Reject native refLinus Torvalds1-0/+2
2007-02-27Fix git-show man page formatting in the EXAMPLES sectionTheodore Tso1-3/+3
2007-02-27git-apply: do not fix whitespaces on context lines.Junio C Hamano1-1/+2
2007-02-27diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering1-3/+3
2007-02-27mailinfo: do not get confused with logical lines that are too long.Linus Torvalds6-19/+147
2007-02-26git-gui: Don't create empty (same tree as parent) commits.gitgui-0.6.2Shawn O. Pearce1-0/+18
2007-02-26git-gui: Add Reset to the Branch menu.Shawn O. Pearce1-0/+6
2007-02-26git-gui: Relocate the menu/transport menu code.Shawn O. Pearce1-22/+28
2007-02-26GIT 1.5.0.2v1.5.0.2Junio C Hamano2-12/+18
2007-02-26git-remote: support remotes with a dot in the namePavel Roskin1-1/+1
2007-02-25Documentation: describe "-f/-t/-m" options to "git-remote add"Junio C Hamano1-0/+13
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2-7/+34
2007-02-25Merge branch 'jc/merge-symlink' into maintJunio C Hamano2-2/+2
2007-02-25merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano1-1/+1
2007-02-25merge-index: fix longstanding bug in merging symlinksJunio C Hamano1-1/+1
2007-02-25Add Release Notes to prepare for 1.5.0.2Junio C Hamano2-1/+60
2007-02-25Allow arbitrary number of arguments to git-pack-objectsRoland Dreier1-3/+9
2007-02-25rerere: do not deal with symlinks.Junio C Hamano1-5/+9
2007-02-25rerere: do not skip two conflicted paths next to each other.Junio C Hamano1-1/+1
2007-02-24Merge git://repo.or.cz/git-gui into maintJunio C Hamano1-6/+19
2007-02-25Don't modify CREDITS-FILE if it hasn't changed.Junio C Hamano1-6/+19
2007-02-24diff-patch: Avoid emitting double-slashes in textual patch.Junio C Hamano1-2/+4
2007-02-24Reword git-am 3-way fallback failure message.Junio C Hamano1-1/+1
2007-02-24Limit filename for format-patchRobin Rosenberg1-7/+21
2007-02-24core.legacyheaders: Use the description used in RelNotes-1.5.0Santi Béjar1-4/+11
2007-02-24git-show-ref --verify: Fail if called without a referenceDmitry V. Levin1-2/+4
2007-02-22git-diff: fix combined diffJohannes Schindelin1-1/+2
2007-02-22Fix 'git commit -a' in a newly initialized repositoryFredrik Kuivinen1-0/+4
2007-02-21Include git-gui credits file in dist.Shawn O. Pearce1-1/+2
2007-02-21Document the new core.bare configuration option.Shawn O. Pearce1-0/+12
2007-02-21Merge branch 'master' of git://repo.or.cz/git-gui into maintJunio C Hamano6-120/+308
2007-02-21Use gunzip -c over gzcat in import-tars example.Michael Loeffler1-3/+6
2007-02-21git-gui: Don't crash in citool mode on initial commit.gitgui-0.6.1Shawn O. Pearce1-8/+8
2007-02-21git-gui: Remove TODO list.Shawn O. Pearce1-44/+0
2007-02-21git-gui: Include browser in our usage message.Shawn O. Pearce1-1/+1
2007-02-21git-gui: Change summary of git-gui.Shawn O. Pearce1-1/+1
2007-02-21git-gui: Display all authors of git-gui.Shawn O. Pearce4-10/+136
2007-02-21git-gui: Use mixed path for docs on Cygwin.Shawn O. Pearce1-1/+1
2007-02-20Check for PRIuMAX rather than NO_C99_FORMAT in fast-import.c.Jason Riedy1-21/+16
2007-02-19Obey NO_C99_FORMAT in fast-import.c.Jason Riedy1-14/+23
2007-02-19Add a compat/strtoumax.c for Solaris 8.Jason Riedy3-0/+28
2007-02-19git-clone: Sync documentation to usage note.Christian Schlotter2-3/+3
2007-02-18GIT 1.5.0.1v1.5.0.1Junio C Hamano3-8/+13
2007-02-18Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingFredrik Kuivinen1-6/+6
2007-02-18Read the config in rev-listFredrik Kuivinen1-0/+1
2007-02-18git-gui: Correct crash when saving options in blame mode.Shawn O. Pearce1-15/+21
2007-02-17Update draft release notes for 1.5.0.1Junio C Hamano1-2/+19
2007-02-17Merge git://git.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano0-0/+0
2007-02-17Convert update-index references in docs to add.Shawn O. Pearce9-14/+15
2007-02-17Attempt to improve git-rebase lead-in description.Shawn O. Pearce1-8/+14
2007-02-16Do not take mode bits from index after type change.Junio C Hamano6-16/+46
2007-02-16git-blame: prevent argument parsing segfaultTommi Kyntola1-0/+3
2007-02-16git-merge: minor fix for no_trivial_merge_strategies.Junio C Hamano1-6/+9
2007-02-16git-gui: Expose the browser as a subcommand.Shawn O. Pearce1-5/+21
2007-02-15pretend-sha1: grave bugfix.Junio C Hamano1-1/+3
2007-02-15git-gui: Create new branches from a tag.Martin Koegler1-0/+30
2007-02-14GIT-VERSION-FILE: check ./version first.Junio C Hamano1-10/+11
2007-02-14sha1_file.c: Round the mmap offset to half the window size.Alexandre Julliard1-5/+3
2007-02-15Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl1-10/+13
2007-02-15Make gitk save and restore the user set window position.Mark Levedahl1-5/+6
2007-02-15[PATCH] gitk: Use show-ref instead of ls-remoteJunio C Hamano1-2/+2
2007-02-15[PATCH] Make gitk work reasonably well on Cygwin.Junio C Hamano1-126/+150
2007-02-15[PATCH] gitk - remove trailing whitespace from a few lines.Mark Levedahl1-4/+4
2007-02-15Change git repo-config to git configPaul Mackerras1-1/+1
2007-02-14Make sure packedgitwindowsize is multiple of (pagesize * 2)Junio C Hamano2-5/+10
2007-02-14Add RelNotes 1.5.0.1Junio C Hamano1-0/+20
2007-02-14Still updating 1.5.0 release notes.Junio C Hamano1-5/+2
2007-02-14git-daemon: Avoid leaking the listening sockets into child processes.Alexandre Julliard1-0/+10
2007-02-14Clarify two backward incompatible repository options.Junio C Hamano1-2/+8
2007-02-14git-gui: Prefer version file over git-describe.Shawn O. Pearce1-6/+11
2007-02-13Makefile: update check-docs targetJunio C Hamano1-1/+4
2007-02-13cmd-list: add git-remoteJunio C Hamano1-0/+1
2007-02-13Documentation: Drop full-stop from git-fast-import title.Junio C Hamano1-1/+1
2007-02-14git-gui: Print version on the console.Shawn O. Pearce1-0/+7
2007-02-14git-gui: More consistently display the application name.Shawn O. Pearce1-4/+4
2007-02-13Minor corrections to release notesNicolas Pitre1-14/+12
2007-02-13git-gui: Permit merging tags into the current branch.Shawn O. Pearce1-3/+5
2007-02-13git-gui: Basic version check to ensure git 1.5.0 or later is used.Shawn O. Pearce1-0/+32
2007-02-13git-gui: Refactor 'exec git subcmd' idiom.Shawn O. Pearce1-23/+31
2007-02-14GIT 1.5.0v1.5.0Junio C Hamano1-1/+1
2007-02-13Add release notes to the distribution.Junio C Hamano5-2/+490
2007-02-13Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano1-1/+1
2007-02-13Documentation: Moving out of detached HEAD does not warn anymore.Junio C Hamano1-16/+6
2007-02-13Mark places that need blob munging later for CRLF conversion.Linus Torvalds3-0/+3
2007-02-13Update RPM core package descriptionNicolas Pitre1-12/+9
2007-02-13Fix potential command line overflow in hooks--updateAndy Parkins1-1/+1
2007-02-13git-gc: run pack-refs by default unless the repo is bareJohannes Schindelin3-0/+23
2007-02-13git-gui: fix typo in GIT-VERSION-GEN, "/dev/null" not "/devnull"Andy Parkins1-1/+1
2007-02-12"git-fetch --tags $URL" should not overwrite existing tagsJunio C Hamano1-15/+2
2007-02-12for-each-reflog: not having $GIT_DIR/logs directory is not an error.Junio C Hamano1-1/+1
2007-02-12Do not forget to pack objects reachable from HEAD reflog.Junio C Hamano1-1/+1
2007-02-12Work around Subversion race in git-svn tests.Michael Spang5-2/+13
2007-02-12Clarify that git-update-server-info should be run for every git-pushPavel Roskin1-8/+8
2007-02-12blameview: Move the commit info to a pane below the blame window.Aneesh Kumar K.V1-7/+26
2007-02-12git merge documentation: -m is optionalMatthias Lederhofer1-1/+1
2007-02-12Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl1-10/+13
2007-02-12Add RPM target for git-guiJunio C Hamano1-3/+23
2007-02-12Link git-gui into the master Makefile.Shawn O. Pearce1-2/+8
2007-02-12Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano3-19/+58
2007-02-12git-gui: Change base version to 0.6.gitgui-0.6.0Shawn O. Pearce1-1/+1
2007-02-12git-gui: Guess our version accurately as a subproject.Shawn O. Pearce1-4/+37
2007-02-12git-gui: Handle gitgui tags in version gen.Shawn O. Pearce1-5/+3
2007-02-12git-gui: Generate a version file on demand.Shawn O. Pearce1-1/+5
2007-02-12git-gui: Rename GIT_VERSION to GITGUI_VERSION.Shawn O. Pearce3-6/+6
2007-02-12git-gui: Allow gitexecdir, INSTALL to be set by the caller.Shawn O. Pearce1-3/+7
2007-02-12import-tars: brown paper bag fix for file mode.Michael Loeffler1-3/+1
2007-02-12fast-import: Support reusing 'from' and brown paper bag fix reset.Shawn O. Pearce3-14/+77
2007-02-11Merge git-guiJunio C Hamano5-0/+6065
2007-02-11Add discussion section to git-tag documentation.Junio C Hamano1-0/+131
2007-02-11Teach git-am to pass -p option down to git-applyJunio C Hamano2-8/+6
2007-02-11Documentation: git-rebase -C<n>Junio C Hamano1-1/+1
2007-02-11Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano4-11/+67
2007-02-11bash: Hide git-fast-import.Shawn O. Pearce1-0/+1
2007-02-11fast-import: Add tip about importing renames.Shawn O. Pearce1-0/+7
2007-02-11fast-import: Hide the pack boundary commits by default.Shawn O. Pearce3-11/+59
2007-02-11git-gui: Stop deleting gitk preferences.Shawn O. Pearce1-8/+0
2007-02-11Document that git-am can read standard input.Michael S. Tsirkin1-0/+4
2007-02-11Make gitk save and restore the user set window position.Mark Levedahl1-5/+6
2007-02-11t4016: test quoting funny pathnames in diff outputJunio C Hamano1-0/+66
2007-02-11diff.c: More logical file name quoting for renames in diffstat.Alexandre Julliard1-7/+27
2007-02-11diff.c: Properly quote file names in diff --summary output.Alexandre Julliard1-5/+12
2007-02-11diff.c: Reuse the pprint_rename function for diff --summary output.Alexandre Julliard1-27/+4
2007-02-11Make it easier to override path to asciidoc commandDotan Barak1-6/+7
2007-02-11Avoid ugly linewrap in git helpRen,bi(B Scharfe1-2/+2
2007-02-10Fixed some typos in git-repack docsMukund1-3/+3
2007-02-10git-svn: correctly handle boolean options via git-configEric Wong1-1/+1