summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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-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-10format-patch: show patch text for the root commitJunio C Hamano1-0/+7
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 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
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-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-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
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds1-9/+7
2008-12-17Make 'index_path()' use 'strbuf_readlink()'Linus Torvalds1-9/+5
2008-12-17Make 'ce_compare_link()' use the new 'strbuf_readlink()'Linus Torvalds1-14/+8
2008-12-17Add generic 'strbuf_readlink()' helper functionLinus Torvalds3-4/+30
2008-12-17git-gui: Get rid of the last remnants of GIT_CONFIG_LOCALJohannes Schindelin1-1/+0
2008-12-17doc/git-reset: add reference to git-stashMarkus Heidelberg1-0/+2
2008-12-17Documentation: fix description for enabling hooksMarkus Heidelberg2-2/+4
2008-12-17git-daemon documentation: use {tilde}Miklos Vajna1-2/+2
2008-12-16gitweb: do not run "git diff" that is PorcelainJunio C Hamano1-37/+3
2008-12-16GIT 1.5.6.6v1.5.6.6Junio C Hamano5-37/+33
2008-12-16GIT 1.5.5.6v1.5.5.6Junio C Hamano4-37/+23
2008-12-16GIT 1.5.4.7v1.5.4.7Junio C Hamano2-1/+11
2008-12-16gitweb: do not run "git diff" that is PorcelainJunio C Hamano1-36/+2
2008-12-15bash completion: Sync config variables with their man pagesLee Marlow1-7/+80
2008-12-15bash completion: Sort config completion variablesLee Marlow1-37/+40
2008-12-15Merge branch 'maint'Junio C Hamano4-3/+32
2008-12-15fast-import: close pack before unlinking itJohannes Schindelin1-1/+3
2008-12-15merge-recursive: do not clobber untracked working tree garbageJunio C Hamano2-1/+33
2008-12-15modify/delete conflict resolution overwrites untracked fileClemens Buchacher1-0/+87
2008-12-15pager: do not dup2 stderr if it is already redirectedJunio C Hamano1-1/+2
2008-12-15git-show: do not segfault when showing a bad tagJunio C Hamano2-1/+27
2008-12-14Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3Johannes Schindelin4-8/+3
2008-12-14Documentation: Describe git-gui Tools menu configuration options.Alexander Gavrilov1-0/+51
2008-12-14git-fast-import possible memory corruption problemYONETANI Tomokazu1-3/+4
2008-12-13builtin-commit: remove unused message variableMarkus Heidelberg1-5/+0
2008-12-12Merge branch 'maint'Junio C Hamano1-1/+1
2008-12-12git-branch: display sha1 on branch deletionBrandon Casey2-2/+4
2008-12-12git-config.txt: fix a typoJim Meyering1-1/+1
2008-12-11Merge branch 'maint'Junio C Hamano4-7/+64
2008-12-11fsck: reduce stack footprintLinus Torvalds1-7/+31
2008-12-10rebase: improve error messages about dirty stateJeff King1-3/+6
2008-12-10make sure packs to be replaced are closed beforehandNicolas Pitre3-0/+33
2008-12-10Fix typo in comment in builtin-add.cAlexander Potashev1-1/+1
2008-12-10git-gui: Update Hungarian translation for 0.12Miklos Vajna1-90/+96
2008-12-10git-gui: Fixed typos in Swedish translation.Peter Krefting1-3/+3
2008-12-10Fix t4031Junio C Hamano1-1/+1
2008-12-09Merge branch 'maint'Junio C Hamano3-13/+63
2008-12-09diff: respect textconv in rewrite diffsJeff King2-13/+59
2008-12-09diff: fix handling of binary rewrite diffsJeff King2-1/+48
2008-12-09Fix typos in documentationAlexander Potashev2-2/+2
2008-12-09git-p4: Fix regression in p4Where method.Tor Arvid Lund1-3/+10
2008-12-09Improve language in git-merge.txt and related docsRalf Wildenhues9-49/+48
2008-12-09work around Python warnings from AsciiDocJunio C Hamano1-9/+9
2008-12-09git-gui: Updated Swedish translation (515t0f0u).Peter Krefting1-100/+117
2008-12-09git gui: update Italian translationMichele Ballabio1-90/+96
2008-12-09git-gui: Update Japanese translation for 0.12Nanako Shiraishi1-3/+8
2008-12-08Define linkgit macro in [macros] sectionAlexey Borzenkov1-0/+3
2008-12-08git-svn: Make following parents atomicDeskin Miller2-4/+54
2008-12-08git-gui: Starting translation for NorwegianFredrik Skolmli1-0/+2484
2008-12-08gitweb: Fix bug in insert_file() subroutineJakub Narebski2-1/+11
2008-12-08git-gui: Update German (completed) translation.Christian Stimming1-40/+239
2008-12-08git-gui: Update po template to include 'Mirroring %s' messageShawn O. Pearce1-89/+95
2008-12-08git-gui: Fix commit encoding handling.Alexander Gavrilov2-7/+5
2008-12-08git-gui: Fix handling of relative paths in blame.Alexander Gavrilov1-2/+16
2008-12-07diff: allow turning on textconv explicitly for plumbingJeff King1-0/+4
2008-12-07reorder ALLOW_TEXTCONV option settingJeff King3-4/+4
2008-12-07read-cache.c: typofix in commentJunio C Hamano1-1/+1
2008-12-07builtin-checkout.c: check error return from read_cache()Junio C Hamano1-2/+5
2008-12-07Point "stale" 1.6.0.5 documentation from the main git documentation pagev1.6.1-rc2Junio C Hamano1-1/+2
2008-12-07Revert "git-stash: use git rev-parse -q"Junio C Hamano1-6/+6
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 20:10:31 +0000