summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-06-03GIT 1.6.3.2v1.6.3.2Junio C Hamano2-8/+6
2009-06-03grep: fix empty word-regexp matchesRené Scharfe1-1/+5
2009-06-03blame: correctly handle a path that used to be a directoryJunio C Hamano2-8/+33
2009-06-03add -i: do not dump patch during applicationThomas Rast1-1/+0
2009-06-02Update draft release notes for 1.6.3.2Junio C Hamano1-14/+26
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2-16/+21
2009-06-02Merge branch 'rs/maint-grep-word-regexp-fix' into maintJunio C Hamano2-1/+11
2009-06-02Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maintJunio C Hamano6-0/+93
2009-06-02Merge branch 'jc/maint-add-p-coalesce-fix' into maintJunio C Hamano2-1/+133
2009-06-02Merge branch 'tr/maint-doc-stash-pop' into maintJunio C Hamano2-16/+18
2009-06-01grep: fix colouring of matches with zero lengthRené Scharfe1-0/+2
2009-05-28Documentation: teach stash/pop workflow instead of stash/applyThomas Rast2-16/+18
2009-05-27fix segfault showing an empty remoteClemens Buchacher2-4/+14
2009-05-25Prepare for 1.6.3.2Junio C Hamano2-1/+52
2009-05-25Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maintJunio C Hamano1-0/+4
2009-05-25Merge branch 'lt/maint-diff-reduce-lstat' into maintJunio C Hamano2-3/+3
2009-05-25Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maintJunio C Hamano2-1/+20
2009-05-25Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano2-5/+101
2009-05-25Merge branch 'jk/maint-1.6.0-trace-argv' into maintJunio C Hamano1-4/+4
2009-05-25Merge branch 'np/push-delta' into maintJunio C Hamano3-8/+23
2009-05-25Merge branch 'ar/merge-one-file-diag' into maintJunio C Hamano0-0/+0
2009-05-25Merge branch 'ar/unlink-err' into maintJunio C Hamano26-50/+68
2009-05-25Merge branch 'jk/maint-add-empty' into maintJunio C Hamano1-1/+1
2009-05-25fix cat-file usage message and documentationJeff King2-4/+4
2009-05-25fetch: report ref storage DF errors more accuratelyJeff King1-3/+8
2009-05-25lock_ref: inform callers of unavailable refJeff King1-1/+3
2009-05-25t3701: ensure correctly set up repository after skipped testsJohannes Sixt1-0/+6
2009-05-25merge-options.txt: Clarify merge --squashMichael J Gruber1-1/+2
2009-05-24Change xdl_merge to generate output even for null mergesCharles Bailey2-17/+16
2009-05-24t6023: merge-file fails to output anything for a degenerate mergeCharles Bailey1-0/+6
2009-05-24Merge branch 'maint-1.6.2' into maintJunio C Hamano1-1/+2
2009-05-24Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano1-1/+2
2009-05-24Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+2
2009-05-24http-push.c::remove_locks(): fix use after freeAlex Riesen1-1/+2
2009-05-23grep: fix word-regexp at the beginning of linesRené Scharfe2-1/+9
2009-05-23apply, fmt-merge-msg: use relative filenamesStephen Boyd4-0/+79
2009-05-23commit: -F overrides -tStephen Boyd2-0/+14
2009-05-20grep: fix word-regexp colouringRené Scharfe1-0/+5
2009-05-20completion: use git rev-parse to detect bare reposGiuseppe Bilotta1-1/+1
2009-05-20Cope better with a _lot_ of packsJohannes Schindelin1-0/+6
2009-05-20for-each-ref: fix segfault in copy_emailJeff King1-2/+5
2009-05-17show-branch: Fix die message in parse_reflog_param()Stephen Boyd1-1/+1
2009-05-16completion: add missing options to show-branch and showStephen Boyd1-2/+2
2009-05-16dir.c: clean up handling of 'path' parameter in read_directory_recursive()Linus Torvalds1-1/+1
2009-05-16Fix type-punning issuesDan McGee2-2/+5
2009-05-16test: checkout shouldn't say that HEAD has moved if it didn'tNanako Shiraishi1-0/+8
2009-05-16completion: enhance "current branch" displayJunio C Hamano1-2/+13
2009-05-16completion: simplify "current branch" in __git_ps1()Junio C Hamano1-7/+8
2009-05-16completion: fix PS1 display during a merge on detached HEADJunio C Hamano1-3/+3
2009-05-16Revert "git-add--interactive: remove hunk coalescing"Junio C Hamano2-2/+96
2009-05-16Splitting a hunk that adds a line at the top fails in "add -p"Matt Graham1-0/+32
2009-05-16builtin-checkout: Don't tell user that HEAD has moved before it hasDaniel Cordero1-8/+8
2009-05-16pre-commit.sample: don't print incidental SHA1Jim Meyering1-1/+1
2009-05-16tests: Add tests for missing format-patch long optionsStephen Boyd2-0/+17
2009-05-16api-parse-options.txt: use 'func' instead of 'funct'Stephen Boyd1-1/+1
2009-05-16Turn on USE_ST_TIMESPEC for OpenBSDTony Kemp1-0/+1
2009-05-16Merge branch 'maint-1.6.2' into maintJunio C Hamano1-1/+3
2009-05-13Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano1-1/+3
2009-05-13Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+3
2009-05-13Add NO_CROSS_DIRECTORY_HARDLINKS support to the MakefileJohannes Schindelin1-0/+4
2009-05-12GIT 1.6.3.1v1.6.3.1Junio C Hamano2-7/+5
2009-05-12Merge branch 'maint-1.6.2' into maintJunio C Hamano2-8/+29
2009-05-12Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2Junio C Hamano2-8/+29
2009-05-12Revert "checkout branch: prime cache-tree fully"Junio C Hamano2-8/+29
2009-05-10ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen1-0/+2
2009-05-10ls-tree manpage: use "unless" instead of "when ... is not"Alex Riesen1-1/+1
2009-05-09merge-recursive: never leave index unmerged while recursingDave Olszewski2-5/+101
2009-05-09Teach 'git checkout' to preload the index contentsLinus Torvalds1-2/+2
2009-05-09Avoid unnecessary 'lstat()' calls in 'get_stat_data()'Linus Torvalds1-1/+1
2009-05-09add: don't complain when adding empty project rootJeff King1-1/+1
2009-05-09format-patch let -k override a config-specified format.numberedJim Meyering2-1/+20
2009-05-09fix GIT_TRACE segfault with shell-quoted aliasesJeff King1-4/+4
2009-05-09Documentation: cloning to empty directory is allowedAlexander Potashev1-1/+1
2009-05-09Clarify kind of conflict in merge-one-file helperAlex Riesen1-2/+9
2009-05-09git config: clarify --add and --get-colorFelipe Contreras1-2/+3
2009-05-08archive-tar.c: squelch a type mismatch warningJunio C Hamano1-1/+1
2009-05-08Start 1.6.3.1 maintenance series.Junio C Hamano2-1/+13
2009-05-08Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano0-0/+0
2009-05-08Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-2/+2
2009-05-06GIT 1.6.3v1.6.3Junio C Hamano3-8/+4
2009-05-06t4029: use sh instead of bashNguyễn Thái Ngọc Duy1-1/+1
2009-05-06t4200: convert sed expression which operates on non-text file to perlBrandon Casey1-1/+1
2009-05-06t4200: remove two unnecessary linesBrandon Casey1-2/+0
2009-05-06t/annotate-tests.sh: avoid passing a non-newline terminated file to sedBrandon Casey1-1/+4
2009-05-06t4118: avoid sed invocation on file without terminating newlineBrandon Casey1-1/+1
2009-05-06t4118: add missing '&&'Brandon Casey1-1/+1
2009-05-06t8005: use egrep when extended regular expressions are requiredBrandon Casey1-4/+4
2009-05-06git-clean doc: the command only affects paths under $(cwd)Junio C Hamano1-2/+2
2009-05-05Merge branch 'maint'Junio C Hamano5-19/+21
2009-05-05Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maintJunio C Hamano1-1/+1
2009-05-05Merge branch 'maint-1.6.0' into maintJunio C Hamano1-2/+2
2009-05-05improve error message in config.cAlex Riesen1-1/+1
2009-05-05t4018-diff-funcname: add cpp xfuncname pattern to syntax testBrandon Casey1-1/+1
2009-05-05Work around BSD whose typeof(tv.tv_sec) != time_tBernd Ahlers1-1/+3
2009-05-05git-am.txt: reword extra headers in message bodyStephen Boyd1-4/+4
2009-05-05git-am.txt: Use date or value instead of time or timestampStephen Boyd1-4/+4
2009-05-05git-am.txt: add an 'a', say what 'it' is, simplify a sentenceStephen Boyd1-6/+6
2009-05-05completion: complete values for send-emailStephen Boyd1-3/+36
2009-05-05completion: complete values for log.dateStephen Boyd1-3/+6
2009-05-05completion: complete values for help.formatStephen Boyd1-0/+4
2009-05-05completion: add {gui,diff,merge}tool, man, and pager config variablesStephen Boyd1-0/+45
2009-05-05completion: add missing configuration variables to _git_config()Stephen Boyd1-0/+48
2009-05-05dir.c: Fix two minor grammatical errors in commentsAllan Caffee1-2/+2
2009-05-05git-svn: fix a sloppy Getopt::Long usageRobin H. Johnson1-1/+1
2009-05-03Sync with GIT 1.6.2.5Junio C Hamano3-1/+58
2009-05-03GIT 1.6.2.5v1.6.2.5Junio C Hamano3-2/+23
2009-05-03Merge branch 'np/maint-no-ofs-delta' into maintJunio C Hamano1-1/+12
2009-05-03Merge branch 'maint-1.6.1' into maintJunio C Hamano1-0/+25
2009-05-03GIT 1.6.1.4v1.6.1.4Junio C Hamano2-1/+26
2009-05-03Merge branch 'jc/maint-read-tree-multi' into maintJunio C Hamano4-41/+55
2009-05-03Merge branch 'mk/maint-apply-swap' into maintJunio C Hamano2-7/+112
2009-05-03Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano1-1/+1
2009-05-03Merge branch 'lt/pack-object-memuse' into maintJunio C Hamano7-43/+56
2009-05-03Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano11-74/+105
2009-05-03Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2-1/+17
2009-05-03Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano4-5/+29
2009-05-01GIT 1.6.3-rc4v1.6.3-rc4Junio C Hamano1-0/+6
2009-05-01honor repack.usedeltabaseoffset when fetching packsNicolas Pitre1-1/+12
2009-05-01Merge git://repo.or.cz/git-guiJunio C Hamano22-657/+1254
2009-05-01allow OFS_DELTA objects during a pushNicolas Pitre3-8/+23
2009-05-01ctype.c: fix typo in commentRené Scharfe1-1/+1
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras25-64/+64
2009-05-01git-gui: Fixes for Mac OS X TkAquaDaniel A. Steffen2-19/+22
2009-04-30Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-25/+1381
2009-05-01gitk: Add Russian translationAlex Riesen1-0/+1085
2009-04-29Clarify kind of conflict in merge-one-file helperAlex Riesen1-2/+9
2009-04-29improve error message in config.cAlex Riesen1-1/+1
2009-04-29print unlink(2) errno in copy_or_link_directoryAlex Riesen1-1/+2
2009-04-29replace direct calls to unlink(2) with unlink_or_warnAlex Riesen23-49/+44
2009-04-29Introduce an unlink(2) wrapper which gives warning if unlink failedAlex Riesen2-0/+22
2009-04-29Merge branch 'maint'Junio C Hamano2-9/+64
2009-04-29daemon.c: fix segfault on OS XBenjamin Kramer1-14/+14
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano2-5/+9
2009-04-29git config: error when editing a repo config and not being in oneFelipe Contreras1-0/+2
2009-04-29parseopt: fix documentation for --keep-dashdashUwe Kleine-König1-1/+1
2009-04-29Rename core.unreliableHardlinks to core.createObjectJohannes Schindelin6-16/+30
2009-04-29Merge branch 'maint-1.6.1' into maintJunio C Hamano2-12/+65
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-12/+65
2009-04-29diff -c -p: do not die on submodulesJunio C Hamano2-12/+65
2009-04-29git-gui: Update Russian translationAlex Riesen1-401/+979
2009-04-28doc: consistently use ASCIIDOC_EXTRAEric Blake1-3/+3
2009-04-28Makefile: installing git in cygwin 1.7.0Eric Blake1-1/+1
2009-04-28Merge branch 'maint'Junio C Hamano4-4/+12
2009-04-28Merge branch 'maint-1.6.1' into maintJunio C Hamano4-4/+12
2009-04-28Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano4-4/+12
2009-04-28SubmittingPatches: itemize and reflect upon well written changesSam Vilain1-1/+13
2009-04-27Makefile: fix NO_PERL bug with gitwebJeff King1-3/+1
2009-04-27grep: fix segfault when "git grep '('" is givenLinus Torvalds2-2/+10
2009-04-27t5701: do not get stuck in empty-push/Johannes Schindelin1-2/+2
2009-04-27NetBSD compilation fixPatrick Welche2-0/+2
2009-04-27Documentation: fix a grammatical error in api-builtin.txtAllan Caffee1-1/+1
2009-04-27builtin-merge: fix a typo in an error messageAllan Caffee1-1/+1
2009-04-27Add semicolon to curly brace group in main MakefileMark Drago1-1/+1
2009-04-27prune-packed: advanced progress even for non-existing fan-out directoriesJohannes Sixt1-0/+1
2009-04-26t4202: fix typov1.6.3-rc3Linus Torvalds1-1/+1
2009-04-25Add an option not to use link(src, dest) && unlink(src) when that is unreliableJohannes Schindelin6-1/+28
2009-04-25connect: replace inet_ntop with getnameinfoBenjamin Kramer1-11/+4
2009-04-25Documentation: git-clean: make description more readableWesley J. Landaker1-5/+8
2009-04-25Documentation: git-clean: fix minor grammatical errorsWesley J. Landaker1-3/+3
2009-04-25Remove obsolete bug warning in man git-update-server-infoSitaram Chamarty1-6/+0
2009-04-25t7700-repack: repack -a now works properly, expect success from testBrandon Casey1-1/+1
2009-04-25t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey1-1/+1
2009-04-25progress bar: round to the nearest instead of truncating downNicolas Pitre1-4/+4
2009-04-24GIT 1.6.3-rc2v1.6.3-rc2Junio C Hamano1-1/+5
2009-04-24Merge branch 'maint'Junio C Hamano1-1/+1
2009-04-24Merge branch 'maint-1.6.1' into maintJunio C Hamano1-1/+1
2009-04-24Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+1
2009-04-24t7800: respect NO_PERLJeff King1-0/+5
2009-04-24remote.c: do not trigger remote.<name>.<var> codepath for two-level namesJohannes Sixt1-1/+1
2009-04-24builtin-help: silently tolerate unknown keysJohannes Sixt1-2/+1
2009-04-24Explain seemingly pointless use of system in difftoolAlex Riesen1-0/+6
2009-04-23Makefile: ignore perl/ subdirectory under NO_PERLJunio C Hamano1-0/+2
2009-04-23config.txt: Make configuration paragraph more consistentStephen Boyd1-3/+3
2009-04-23config.txt: clarify sentences in the configuration and syntax sectionsStephen Boyd1-6/+6
2009-04-23config.txt: add missing 'the's and make words pluralStephen Boyd1-17/+17
2009-04-23git-format-patch.txt: general rewordings and cleanupsStephen Boyd1-19/+19
2009-04-23git-show-branch.txt: cleanup example descriptionStephen Boyd1-3/+4
2009-04-23Documentation: use lowercase for shallow and deep threadingStephen Boyd2-4/+4
2009-04-23config.txt: add missing format.{subjectprefix,cc,attach} variablesStephen Boyd1-0/+15
2009-04-23test-genrandom: Add newline to usage stringStephen Boyd1-1/+1
2009-04-22Merge branch 'jc/maint-read-tree-multi'Junio C Hamano4-41/+55
2009-04-22Add parsing of elm aliases to git-send-emailBill Pemberton2-1/+9
2009-04-22Convert to use quiet option when availableDan Loewenherz4-5/+5
2009-04-22Fix more typos/spelling in commentsMichael J Gruber4-4/+4
2009-04-22Fix typos / spelling in commentsMike Ralphson20-27/+27
2009-04-22Documentation: git-svn: fix a grammatical error without awkwardnessWesley J. Landaker1-1/+1
2009-04-22Documentation: git-svn: fix spurious bolding that mangles the outputWesley J. Landaker1-1/+1
2009-04-22Wait for git diff to finish in git difftoolAlex Riesen1-1/+2
2009-04-22graph API: fix a bug in the rendering of octopus mergesAllan Caffee2-2/+2
2009-04-22graph API: fix extra space during pre_commit_line stateAllan Caffee1-2/+2
2009-04-22t4202-log: extend test coverage of graphingAllan Caffee1-2/+28
2009-04-21Revert "stat_tracking_info(): only count real commits"Junio C Hamano2-6/+1
2009-04-21test-lib.sh: Help test_create_repo() find the templates dirMichael J Gruber1-1/+1
2009-04-21gitk: Fix compare-commits function when we have local changesPaul Mackerras1-19/+47
2009-04-21Merge branch 'mk/maint-apply-swap'Junio C Hamano1-3/+31
2009-04-21Merge branch 'maint'Junio C Hamano2-1/+2
2009-04-20grep: don't support "grep.color"-like config optionsMarkus Heidelberg1-6/+3
2009-04-20Documentation: fix typos / spelling mistakesMike Ralphson4-5/+5
2009-04-20builtin-remote: fix typo in option descriptionMike Ralphson1-1/+1
2009-04-20clone: add test for push on an empty clone.Matthieu Moy1-0/+10