summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-02-07GIT 1.6.1.3v1.6.1.3Junio C Hamano3-2/+34
2009-02-05Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+4
2009-02-05Merge branch 'jc/maint-apply-fix' into maintJunio C Hamano1-1/+1
2009-02-05Merge branch 'am/maint-push-doc' into maintJunio C Hamano2-23/+34
2009-02-05Merge branch 'sg/maint-gitdir-in-subdir' into maintJunio C Hamano2-1/+12
2009-02-05Merge branch 'lt/maint-wrap-zlib' into maintJunio C Hamano9-34/+99
2009-02-05Merge branch 'jc/maint-split-diff-metainfo' into maintJunio C Hamano3-67/+99
2009-02-05Merge branch 'js/maint-all-implies-HEAD' into maintJunio C Hamano6-2/+63
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2-2/+31
2009-02-04Fixed broken git help -w when installing from RPMDavid J. Mellor1-1/+4
2009-02-04urls.txt: document optional port specification in git URLSStefan Naewe1-4/+4
2009-02-04Merge branch 'maint-1.6.0' into maintJunio C Hamano2-5/+13
2009-02-04builtin-mv.c: check for unversionned files before looking at the destination.Matthieu Moy2-5/+5
2009-02-04Add a testcase for "git mv -f" on untracked files.Matthieu Moy1-0/+8
2009-02-04Missing && in t/t7001.sh.Matthieu Moy1-1/+1
2009-02-03Merge branch 'maint-1.6.0' into maintJunio C Hamano5-4/+4
2009-02-03User-manual: "git stash <comment>" form is long goneWilliam Pursell1-1/+1
2009-02-03add test-dump-cache-tree in MakefileGuanqun Lu2-1/+1
2009-02-03fix typo in DocumentationGuanqun Lu1-1/+1
2009-02-03apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin1-1/+1
2009-02-03Merge branch 'maint-1.6.0' into maintJunio C Hamano1-0/+2
2009-02-02grep: pass -I (ignore binary) down to external grepJunio C Hamano1-0/+2
2009-01-31Merge branch 'maint-1.6.0' into maintJunio C Hamano1-3/+6
2009-01-31merge: fix out-of-bounds memory accessRené Scharfe1-3/+6
2009-01-29GIT 1.6.1.2v1.6.1.2Junio C Hamano3-2/+41
2009-01-28Merge branch 'jc/maint-format-patch-o-relative' into maintJunio C Hamano2-4/+76
2009-01-28Merge branch 'bs/maint-rename-populate-filespec' into maintJunio C Hamano1-2/+7
2009-01-28Merge branch 'mh/maint-commit-color-status' into maintJunio C Hamano1-0/+6
2009-01-28Merge branch 'nd/grep-assume-unchanged' into maintJunio C Hamano2-2/+20
2009-01-28Merge branch 'jc/maint-ls-tree' into maintJunio C Hamano2-2/+13
2009-01-28Merge branch 'np/no-loosen-prune-expire-now' into maintJunio C Hamano2-3/+9
2009-01-28Merge branch 'mc/cd-p-pwd' into maintJunio C Hamano2-3/+3
2009-01-28Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+2
2009-01-28avoid 31-bit truncation in write_loose_objectJeff King1-1/+2
2009-01-28builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathJunio C Hamano1-1/+1
2009-01-27send-pack: do not send unknown object name from ".have" to pack-objectsJunio C Hamano2-22/+127
2009-01-27Merge branch 'maint-1.6.0' into maintJunio C Hamano2-2/+2
2009-01-27test-path-utils: Fix off by one, found by valgrindJohannes Schindelin1-1/+1
2009-01-27get_sha1_basic(): fix invalid memory access, found by valgrindJohannes Schindelin1-1/+1
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano3-67/+99
2009-01-27diff.c: output correct index lines for a split diffJunio C Hamano2-66/+98
2009-01-25Documentation: rework src/dst description in git pushAnders Melchiorsen1-11/+12
2009-01-25Documentation: more git push examplesAnders Melchiorsen1-3/+13
2009-01-25Documentation: simplify refspec format descriptionJunio C Hamano2-9/+9
2009-01-25GIT 1.6.1.1v1.6.1.1Junio C Hamano2-8/+18
2009-01-23Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano2-18/+67
2009-01-23Merge branch 'tr/maint-no-index-fixes' into maintJunio C Hamano3-10/+20
2009-01-23Merge branch 'rs/maint-shortlog-foldline' into maintJunio C Hamano2-5/+8
2009-01-23Merge branch 'pj/maint-ldflags' into maintJunio C Hamano1-2/+2
2009-01-23Merge branch 'pb/maint-git-pm-false-dir' into maintJunio C Hamano1-3/+4
2009-01-23Merge branch 'js/maint-bisect-gitk' into maintJunio C Hamano1-1/+1
2009-01-23Merge branch 'js/add-not-submodule' into maintJunio C Hamano2-0/+53
2009-01-23Merge branch 'jc/maint-format-patch' into maintJunio C Hamano1-0/+7
2009-01-23Merge branch 'am/maint-push-doc' into maintJunio C Hamano1-7/+8
2009-01-23Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+1
2009-01-23Fix Documentation for git-describeBoyd Stephen Smith Jr1-1/+1
2009-01-21Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin3-6/+8
2009-01-21Rename detection: Avoid repeated filespec populationBjörn Steinbrink1-2/+7
2009-01-19Fix combined use of whitespace ignore options to diffKeith Cascio2-6/+8
2009-01-19test more combinations of ignore-whitespace options to diffKeith Cascio1-0/+27
2009-01-19shell: Document that 'cvs server' is a valid commandLars Noschinski1-2/+3
2009-01-18Documentation: avoid using undefined parametersAnders Melchiorsen1-2/+2
2009-01-18Documentation: mention branches rather than headsAnders Melchiorsen1-2/+2
2009-01-18Documentation: remove a redundant elaborationAnders Melchiorsen1-2/+1
2009-01-18Documentation: git push repository can also be a remoteAnders Melchiorsen1-1/+3
2009-01-17Update draft release notes for 1.6.1.1Junio C Hamano1-1/+6
2009-01-17bundle: allow the same ref to be given more than onceJunio C Hamano4-1/+23
2009-01-17Merge branch 'maint-1.6.0' into maintJunio C Hamano4-4/+6
2009-01-17builtin-fsck: fix off by one head countChristian Couder1-1/+1
2009-01-17revision walker: include a detached HEAD in --allJohannes Schindelin3-2/+41
2009-01-17Fix gitdir detection when in subdir of gitdirSZEDER Gábor2-1/+12
2009-01-17t5540: clarify that http-push does not handle packed-refs on the remoteJohannes Schindelin1-3/+15
2009-01-17http-push: when making directories, have a trailing slash in the path nameJohannes Schindelin3-2/+11
2009-01-17http-push: fix off-by-path_lenJohannes Schindelin1-3/+7
2009-01-17Documentation: let asciidoc align related optionsMarkus Heidelberg1-1/+4
2009-01-17githooks.txt: add missing wordStephan Beyer1-1/+1
2009-01-17builtin-commit.c: do not remove COMMIT_EDITMSGStephan Beyer1-1/+0
2009-01-15Merge branch 'maint-1.6.0' into maintJunio C Hamano2-0/+34
2009-01-15t3404: Add test case for auto-amending only edited commits after "edit"Stephan Beyer1-0/+17
2009-01-15t3404: Add test case for aborted --continue after "edit"Stephan Beyer1-0/+15
2009-01-15t3501: check that commits are actually doneStephan Beyer1-0/+2
2009-01-14Update draft release notes to 1.6.1.1Junio C Hamano1-2/+23
2009-01-14Merge branch 'maint-1.6.0' into maintJunio C Hamano2-0/+26
2009-01-14Make t3411 executableMiklos Vajna1-0/+0
2009-01-14fix handling of multiple untracked files for git mv -kMichael J Gruber2-1/+2
2009-01-14add test cases for "git mv -k"Michael J Gruber1-0/+25
2009-01-13Merge branch 'maint-1.6.0' into maintJunio C Hamano2-5/+6
2009-01-13fast-import: Cleanup mode setting.Felipe Contreras1-3/+4
2009-01-13Git.pm: call Error::Simple() properlyJay Soffian1-2/+2
2009-01-13Merge branch 'kk/maint-http-push' into maintJunio C Hamano1-6/+19
2009-01-13Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano2-0/+28
2009-01-13Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2-0/+119
2009-01-13Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano2-1/+65
2009-01-13Merge branch 'maint-1.6.0' into maintJunio C Hamano2-1/+4
2009-01-13Avoid spurious error messages on error mistakes.Pierre Habouzit1-1/+1
2009-01-12contrib/examples/README: give an explanation of the status of these filesjidanni@jidanni.org1-0/+3
2009-01-12Teach format-patch to handle output directory relative to cwdJunio C Hamano2-4/+76
2009-01-11Merge branch 'mh/maint-sendmail-cc-doc' into maintJunio C Hamano1-0/+1
2009-01-11Merge branch 'jc/maint-do-not-switch-to-non-commit' into maintJunio C Hamano2-1/+5
2009-01-11Documentation/git-push.txt: minor: compress one optionjidanni@jidanni.org1-3/+1
2009-01-11Wrap inflate and other zlib routines for better error reportingLinus Torvalds9-34/+99
2009-01-10format-patch: show patch text for the root commitJunio C Hamano1-0/+7
2009-01-08git-status -v: color diff output when color.ui is setMarkus Heidelberg1-0/+3
2009-01-08git-commit: color status output when color.ui is setMarkus Heidelberg1-0/+3
2009-01-07diff --no-index -q: fix endless loopThomas Rast1-1/+3
2009-01-06diff --no-index: test for pager after option parsingThomas Rast1-7/+7
2009-01-06diff: accept -- when using --no-indexThomas Rast3-3/+11
2009-01-06Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+1
2009-01-06Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano1-1/+1
2009-01-06README: tutorial.txt is now called gittutorial.txtJoey Hess1-1/+1
2009-01-06shortlog: handle multi-line subjects like log --pretty=oneline et. al. doRené Scharfe2-5/+8
2009-01-05configure clobbers LDFLAGSPaul Jarc1-2/+2
2009-01-05unpack-trees: remove redundant path search in verify_absentClemens Buchacher1-6/+2
2009-01-05unpack-trees: fix path search bug in verify_absentClemens Buchacher2-10/+37
2009-01-05unpack-trees: handle failure in verify_absentClemens Buchacher2-3/+29
2009-01-05Be consistent in switch usage for tarHenrik Austad1-1/+1
2009-01-05Use capitalized names where appropriateHenrik Austad2-4/+4
2009-01-05git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS XMarcel M. Cary2-3/+3
2009-01-05git add: do not add files from a submoduleJohannes Schindelin2-0/+53
2009-01-03bisect view: call gitk if Cygwin's SESSIONNAME variable is setJohannes Schindelin1-1/+1
2009-01-03fast-export: print usage when no options specifiedMiklos Vajna1-0/+3
2009-01-03git checkout: do not allow switching to a tree-ish that is not a commitJunio C Hamano2-1/+5
2009-01-02builtin-apply: prevent non-explicit permission changesJunio C Hamano2-1/+65
2009-01-01Git.pm: correctly handle directory name that evaluates to "false"Philippe Bruhat (BooK)1-3/+4
2009-01-01Documentation/git-tag.txt: minor typo and grammar fixjidanni@jidanni.org1-2/+2
2009-01-01objects to be pruned immediately don't have to be loosenedNicolas Pitre2-3/+9
2009-01-01Document git-ls-tree --full-treeNanako Shiraishi2-2/+8
2008-12-29Prepare for v1.6.1.1 maintenance releaseJunio C Hamano2-1/+24
2008-12-29Documentation/diff-options.txt: unify optionsjidanni@jidanni.org1-14/+4
2008-12-29doc/git-send-email: mention sendemail.cc config variableMarkus Heidelberg1-0/+1
2008-12-27gitweb: Fix export check in git_get_projects_listDevin Doucette1-2/+3
2008-12-27grep: grep cache entries if they are "assume unchanged"Nguyễn Thái Ngọc Duy2-1/+13
2008-12-27grep: support --no-ext-grep to test builtin grepNguyễn Thái Ngọc Duy1-1/+7
2008-12-27Merge branch 'rs/maint-tformat-foldline' into maintJunio C Hamano1-46/+73
2008-12-27Merge branch 'rs/maint-retval-fix' into maintJunio C Hamano2-37/+26
2008-12-27Merge branch 'sp/maint-describe-all-tag-warning' into maintJunio C Hamano2-1/+7
2008-12-27git-send-email.txt: move --format-patch paragraph to a proper locationAdeodato Simó1-6/+6
2008-12-27git-shortlog.txt: improve documentation about .mailmap filesAdeodato Simó1-7/+33
2008-12-27pretty: support multiline subjects with format:René Scharfe1-19/+34
2008-12-27pretty: factor out format_subject()René Scharfe1-18/+24
2008-12-27pretty: factor out skip_empty_lines()René Scharfe1-9/+15
2008-12-26merge-file: handle freopen() failureRené Scharfe1-2/+5
2008-12-26daemon: cleanup: factor out xstrdup_tolower()René Scharfe1-21/+13
2008-12-26daemon: cleanup: replace loop with ifRené Scharfe1-13/+5
2008-12-26daemon: handle freopen() failureRené Scharfe1-1/+3
2008-12-26describe: Avoid unnecessary warning when using --allShawn O. Pearce2-1/+7
2008-12-26ls-tree: add --full-tree optionJunio C Hamano1-0/+5
2008-12-24merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2-0/+28
2008-12-24http-push: support full URI in handle_remote_ls_ctx()Kirill A. Korinskiy1-6/+19
2008-12-24GIT 1.6.1v1.6.1Junio C Hamano2-0/+9
2008-12-24Merge branch 'js/rebase-i-p'Junio C Hamano2-16/+58
2008-12-24rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2-3/+13
2008-12-22t9129: skip the last three tests if UTF-8 locale is not availableMiklos Vajna1-13/+17
2008-12-21GIT 1.6.1-rc4v1.6.1-rc4Junio C Hamano1-1/+18
2008-12-21Always show which directory is not a git repositoryRichard Hartmann3-4/+4
2008-12-21Make help entries alphabeticalRichard Hartmann1-4/+4
2008-12-21Merge branch 'maint'Junio C Hamano1-1/+2
2008-12-21git-revert documentation: refer to new HOWTO on reverting faulty mergesBoyd Stephen Smith Jr1-0/+8
2008-12-21git-revert: record the parent against which a revert was madeRobin Rosenberg1-0/+5
2008-12-21Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-63/+213
2008-12-22gitk: Force the focus to the main window on WindowsJohannes Sixt1-0/+5
2008-12-22gitk: Allow unbalanced quotes/braces in commit headersKevin Ballard1-2/+3
2008-12-22gitk: Update German translationChristian Stimming1-29/+157
2008-12-22gitk: Mark forgotten strings (header sentence parts in color chooser) for tra...Christian Stimming1-6/+6
2008-12-22gitk: Ensure that "Reset branch" menu entry is enabledJohannes Sixt1-1/+1
2008-12-22gitk: Use check-buttons' -text property instead of separate labelsJohannes Sixt1-20/+10
2008-12-22gitk: Map / to focus the search boxGiuseppe Bilotta1-2/+2
2008-12-21doc/git-fsck: change the way for getting heads' SHA1sMarkus Heidelberg1-1/+2
2008-12-21Documentation/git-show-branch: work around "single quote" typesetting glitchMarkus Heidelberg1-1/+1
2008-12-21send-email: futureproof split_addrs() subJunio C Hamano1-1/+1
2008-12-21Make sure lockfiles are unlocked when dying on SIGPIPEJunio C Hamano2-0/+18
2008-12-21fast-import.c: stricter strtoul check, silence compiler warningRené Scharfe1-4/+7
2008-12-21connect.c: stricter port validation, silence compiler warningRené Scharfe1-2/+2
2008-12-21Add a documentat on how to revert a faulty mergeNanako Shiraishi1-0/+179
2008-12-21Remove the requirement opaquelocktoken uri schemeKirill A. Korinskiy1-8/+6
2008-12-21git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dirMarcel M. Cary3-2/+136
2008-12-21rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2-3/+2
2008-12-21Show a failure of rebase -p if the merge had a conflictJohannes Sixt1-11/+44
2008-12-19Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg1-1/+1
2008-12-19Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano26-48/+185
2008-12-19GIT 1.6.0.6v1.6.0.6Junio C Hamano6-38/+67
2008-12-19fast-import: make tagger information optionalJunio C Hamano2-11/+33
2008-12-19fast-export: deal with tag objects that do not have a taggerJohannes Schindelin3-5/+42
2008-12-19SubmittingPatches: mention the usage of real name in Signed-off-by: linesMiklos Vajna1-0/+3
2008-12-19git-mergetool: properly handle "git mergetool -- filename"David Aguilar1-0/+1
2008-12-19git-send-email: handle email address with quoted commaWu Fengguang1-3/+8
2008-12-19Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg13-25/+25
2008-12-19Documentation: sync example output with git outputMarkus Heidelberg4-11/+9
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe1-1/+2
2008-12-18test overlapping ignore patternsMichael J Gruber1-0/+6
2008-12-17Merge branch 'lt/readlink'Junio C Hamano9-50/+62
2008-12-17Enable threaded delta search on Mac OS X/DarwinArjen Laarhoven1-0/+1
2008-12-17Clarify documentation of "git checkout <tree-ish> paths" syntaxNanako Shiraishi1-1/+1
2008-12-17Merge git://repo.or.cz/git-guiJunio C Hamano11-423/+3157
2008-12-17git-gui 0.12gitgui-0.12.0Shawn O. Pearce1-1/+1
2008-12-17githooks documentation: add a note about the +x modeMiklos Vajna1-0/+4
2008-12-17combine-diff.c: use strbuf_readlink()Junio C Hamano1-5/+5
2008-12-17builtin-blame.c: use strbuf_readlink()Junio C Hamano1-4/+1
2008-12-17make_absolute_path(): check bounds when seeing an overlong symlinkJunio C Hamano1-0/+2
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds1-5/+4