summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2008-07-20Merge branch 'ap/trackinfo'v1.6.0-rc0Junio C Hamano1-16/+10
2008-07-20Merge branch 'jc/rerere-auto-more'Junio C Hamano1-2/+5
2008-07-20Merge branch 'ns/am-abort'Junio C Hamano3-5/+77
2008-07-20Merge branch 'jc/add-addremove'Junio C Hamano3-34/+104
2008-07-20"needs update" considered harmfulJunio C Hamano5-4/+9
2008-07-20Move read_in_full() and write_in_full() to wrapper.cJunio C Hamano2-38/+38
2008-07-20Link shell with compat layer functionsJunio C Hamano1-3/+7
2008-07-20Merge branch 'maint'Junio C Hamano3-2/+91
2008-07-20git-svn: fix git svn info to work without argumentsDmitry Potapov1-1/+1
2008-07-20builtin-push.c: Cleanup - use OPT_BIT() and remove some variablesMichele Ballabio1-21/+8
2008-07-20builtin-merge.c: Fix option parsingMichele Ballabio2-3/+4
2008-07-20fix usage string for git grepJonathan Nieder1-1/+1
2008-07-20Teach 'git merge' that some merge strategies no longer existMiklos Vajna1-2/+0
2008-07-20cvsserver: Add testsuite for packed refsLars Noschinski1-0/+7
2008-07-20refresh-index: fix bitmask assignmentJunio C Hamano2-1/+90
2008-07-19git-add --all: documentationJunio C Hamano1-1/+7
2008-07-19git-add --all: testsJunio C Hamano1-0/+44
2008-07-19git-add --all: add all filesJunio C Hamano1-2/+11
2008-07-19builtin-add.c: restructure the code for maintainabilityJunio C Hamano1-32/+43
2008-07-19Getting closer to 1.6.0-rc0Junio C Hamano2-5/+13
2008-07-19git am --abortNanako Shiraishi3-5/+77
2008-07-19Merge branch 'maint'Junio C Hamano6-16/+31
2008-07-19Support gitlinks in fast-import.Alexander Gavrilov5-5/+227
2008-07-19.mailmap updateJunio C Hamano1-0/+9
2008-07-19Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis1-47/+29
2008-07-19archive: remove unused headersRené Scharfe3-9/+0
2008-07-19archive: make zip compression level independent from core gitRené Scharfe3-5/+8
2008-07-19Documentation: How to ignore local changes in tracked filesPetr Baudis2-3/+18
2008-07-19Documentation/git-submodule.txt: Further clarify the descriptionPetr Baudis1-22/+47
2008-07-19Add ANSI control code emulation for the Windows consolePeter Harris3-1/+357
2008-07-19builtin-clone: rewrite guess_dir_name()Johannes Sixt1-29/+32
2008-07-19Teach lookup_prog not to select directoriesEric Raible1-1/+2
2008-07-19testsuite for cvs co -cFabian Emmes1-0/+11
2008-07-19cvsserver: Add cvs co -c supportLars Noschinski1-0/+12
2008-07-19cvsserver: Add support for packed refsLars Noschinski1-14/+8
2008-07-19Testsuite: Unset CVS_SERVERFabian Emmes1-0/+1
2008-07-19Link git-shell only to a subset of libgit.aStephan Beyer1-0/+3
2008-07-19t9001 (send-email): Do not use hardcoded /bin/sh in testJunio C Hamano1-4/+4
2008-07-19GIT 1.5.6.4v1.5.6.4Junio C Hamano1-6/+10
2008-07-19builtin-rm: fix index lock file pathOlivier Marin2-5/+17
2008-07-18Merge branch 'sp/maint-index-pack' into maintJunio C Hamano1-29/+113
2008-07-18http-fetch: do not SEGV after fetching a bad pack idx fileJunio C Hamano1-0/+2
2008-07-17rev-list: honor --quiet optionJunio C Hamano1-4/+1
2008-07-17builtin-remote.c: fix earlier "skip_prefix()" conversionJunio C Hamano1-32/+19
2008-07-17api-run-command.txt: typofixStephan Beyer1-1/+1
2008-07-17Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfilesPetr Baudis1-1/+3
2008-07-16rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano1-2/+5
2008-07-16mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: lineJunio C Hamano1-4/+3
2008-07-16read-cache.c: typofixJunio C Hamano1-1/+1
2008-07-16Update draft release notes for 1.6.0Junio C Hamano1-6/+13
2008-07-16Reword "your branch has diverged..." lines to reduce line lengthAvery Pennarun1-16/+10
2008-07-16Merge branch 'mv/dashless'Junio C Hamano5-18/+22
2008-07-16Merge branch 'ls/mailinfo'Junio C Hamano3-410/+431
2008-07-16Documentation/git-submodule.txt: Add Description sectionPetr Baudis1-0/+22
2008-07-16Merge branch 'sb/dashless'Junio C Hamano139-335/+350
2008-07-16Merge branch 'rs/archive'Junio C Hamano12-274/+208
2008-07-16Merge branch 'ag/blame'Junio C Hamano1-5/+28
2008-07-16Merge branch 'rs/rebase-checkout-not-so-quiet'Junio C Hamano1-2/+1
2008-07-16Merge branch 'sp/maint-index-pack'Junio C Hamano1-29/+113
2008-07-16Merge branch 'maint'Junio C Hamano13-88/+124
2008-07-16Start preparing 1.5.6.4 release notesJunio C Hamano2-1/+44
2008-07-16git fetch-pack: do not complain about "no common commits" in an empty repoJohannes Schindelin1-1/+2
2008-07-16Merge branch 'js/maint-pretty-mailmap' into maintJunio C Hamano2-2/+27
2008-07-16Merge branch 'sp/maint-bash-completion-optim' into maintJunio C Hamano1-18/+50
2008-07-16Merge branch 'sp/maint-pack-memuse' into maintJunio C Hamano1-0/+1
2008-07-16Merge branch 'ls/maint-mailinfo-patch-label' into maintJunio C Hamano7-2/+104
2008-07-16Merge branch 'js/maint-daemon-syslog' into maintJunio C Hamano1-20/+50
2008-07-16rebase-i: keep old parents when preserving mergesStephan Beyer1-0/+2
2008-07-16t7600-merge: Use test_expect_failure to test option parsingJohannes Sixt1-30/+6
2008-07-16Fix buffer overflow in prepare_attr_stackDmitry Potapov1-6/+9
2008-07-16Fix buffer overflow in git diffDmitry Potapov5-25/+34
2008-07-16Fix buffer overflow in git-grepDmitry Potapov1-12/+15
2008-07-16t/Makefile: use specified shell when running aggregation scriptSungHyun Nam1-1/+1
2008-07-16git-cvsserver: fix call to nonexistant cleanupWorkDir()Lars Noschinski1-1/+1
2008-07-16parse-options.c: make check_typos() staticNanako Shiraishi1-1/+1
2008-07-16builtin-describe.c: make a global variable "pattern" staticNanako Shiraishi1-1/+1
2008-07-16cache-tree.c: make cache_tree_find() staticNanako Shiraishi2-3/+1
2008-07-16Documentation/git-cherry-pick.txt et al.: Fix misleading -n descriptionPetr Baudis2-13/+13
2008-07-16t/aggregate-results: whitespace fixJunio C Hamano1-5/+5
2008-07-16t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"Eric Wong1-1/+1
2008-07-15Merge branch 'mv/merge-in-c'Junio C Hamano24-219/+1916
2008-07-15Merge branch 'ag/rewrite_one'Junio C Hamano1-6/+24
2008-07-15Merge branch 'sp/win'Junio C Hamano3-1/+15
2008-07-15Merge branch 'js/more-win'Junio C Hamano7-26/+58
2008-07-15Merge branch 'js/maint-pretty-mailmap'Junio C Hamano2-2/+27
2008-07-15Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin15-66/+66
2008-07-15Do not try to detect move/copy for entries below threshold.Alexander Gavrilov1-5/+11
2008-07-15Avoid rescanning unchanged entries in search for copies.Alexander Gavrilov1-2/+19
2008-07-15Update draft release notes to 1.6.0Junio C Hamano1-1/+17
2008-07-15shortlog: support --pretty=format: optionJohannes Schindelin2-0/+12
2008-07-15Make git-add -i accept ranges like 7-Ciaran McCreesh2-5/+6
2008-07-15t9600: allow testing with cvsps 2.2, including beta versionsPavel Roskin1-2/+2
2008-07-15archive: remove extra arguments parsing codeRené Scharfe3-31/+17
2008-07-15archive: unify file attribute handlingRené Scharfe2-43/+23
2008-07-15archive: centralize archive entry writingRené Scharfe4-154/+133
2008-07-15archive: add baselen member to struct archiver_argsRené Scharfe4-10/+8
2008-07-15add context pointer to read_tree_recursive()René Scharfe8-26/+28
2008-07-15archive: remove args member from struct archiverRené Scharfe3-39/+28
2008-07-15index-pack: Honor core.deltaBaseCacheLimit when resolving deltasShawn O. Pearce1-2/+46
2008-07-15index-pack: Track the object_entry that creates each base_dataShawn O. Pearce1-6/+12
2008-07-15index-pack: Chain the struct base_data on the stack for traversalShawn O. Pearce1-3/+31
2008-07-15index-pack: Refactor base arguments of resolve_delta into a structShawn O. Pearce1-27/+33
2008-07-15Merge git://repo.or.cz/git-guiJunio C Hamano2-3/+8
2008-07-14Merge branch 'js/merge-rr'Junio C Hamano3-5/+5
2008-07-14Merge branch 'sb/rerere-lib'Junio C Hamano6-355/+390
2008-07-14Merge branch 'ls/maint-mailinfo-patch-label'Junio C Hamano7-2/+104
2008-07-14Merge branch 'om/rerere-careful'Junio C Hamano2-9/+33
2008-07-14Merge branch 'jc/branch-merged'Junio C Hamano4-52/+93
2008-07-14Merge branch 'jc/rebase-orig-head'Junio C Hamano6-3/+14
2008-07-14bash completion: Remove dashed command completion supportShawn O. Pearce1-54/+0
2008-07-14Merge branch 'sp/maint-bash-completion-optim'Junio C Hamano1-3/+34
2008-07-14restore legacy behavior for read_sha1_file()Nicolas Pitre3-4/+89
2008-07-14bash: Add long option completion for 'git send-email'Teemu Likonen1-0/+20
2008-07-14git-submodule - register submodule URL if adding in placeMark Levedahl1-0/+10
2008-07-14git-submodule - make "submodule add" more strict, and document itMark Levedahl3-45/+48
2008-07-14git-svn: typofixFrederik Schwarzer1-1/+1
2008-07-14git-svn: find-rev and rebase for SVN::Mirror repositoriesJoão Abecasis2-4/+44
2008-07-14tutorial: clarify "pull" is "fetch + merge"Junio C Hamano1-1/+27
2008-07-14tutorial: use prompt with user names in example, to clarify who is doing whatIan Katz1-13/+13
2008-07-14bash completion: Resolve git show ref:path<tab> losing ref: portionShawn O. Pearce1-2/+25
2008-07-14git-rebase: report checkout failureJunio C Hamano1-3/+1
2008-07-14reduce_heads(): protect from duplicate inputJunio C Hamano2-2/+31
2008-07-13Update draft release notes for 1.6.0Junio C Hamano1-1/+38
2008-07-13git-mailinfo: use strbuf's instead of fixed buffersLukas Sandström1-405/+352
2008-07-13bash completion: Append space after file names have been completedShawn O. Pearce1-1/+9
2008-07-13git-mailinfo: Fix getting the subject from the in-body [PATCH] lineLukas Sandström7-2/+104
2008-07-13Merge branch 'sp/maint-bash-completion-optim'Junio C Hamano1-15/+16
2008-07-13bash completion: Don't offer "a.." as a completion for "a."Shawn O. Pearce1-3/+0
2008-07-13git-request-pull: replace call to deprecated peek-remoteRamsay Jones1-1/+1
2008-07-13Make rebase--interactive use OPTIONS_SPECStephan Beyer1-26/+51
2008-07-13t3404: test two "preserve merges with -p" casesStephan Beyer1-5/+21
2008-07-13git-am/git-mailsplit: correct synopsis for reading from stdinStephan Beyer3-4/+4
2008-07-13Merge branch 'maint' to sync with 1.5.6.3Junio C Hamano8-22/+61
2008-07-13GIT 1.5.6.3v1.5.6.3Junio C Hamano2-9/+20
2008-07-13Merge branch 'ph/parseopt-step-blame'Junio C Hamano8-673/+788
2008-07-13Merge branch 'am/stash-branch'Junio C Hamano3-1/+99
2008-07-13Merge branch 'sg/stash-k-i'Junio C Hamano3-6/+52
2008-07-13Merge branch 'jc/report-tracking'Junio C Hamano7-90/+244
2008-07-13Merge branch 'js/pick-root'Junio C Hamano2-10/+46
2008-07-13Merge branch 'ab/bundle'Junio C Hamano1-2/+11
2008-07-13Merge branch 'tr/add-i-e'Junio C Hamano3-100/+174
2008-07-13git-gui: MERGE_RR lives in .git/ directly with newer Git versionsJohannes Schindelin1-0/+1
2008-07-13help (Windows): Display HTML in default browser using Windows' shell APISteffen Prohaska3-1/+38
2008-07-13help.c: Add support for htmldir relative to git_exec_path()Steffen Prohaska1-3/+5
2008-07-13Move code interpreting path relative to exec-dir to new function system_path()Steffen Prohaska4-22/+15
2008-07-13Make usage strings dash-lessStephan Beyer80-101/+102
2008-07-13Add some useful functions for strbuf manipulation.Lukas Sandström2-0/+76
2008-07-13Make some strbuf_*() struct strbuf arguments const.Lukas Sandström2-4/+4
2008-07-13reduce_heads(): thinkofixSverre Hvammen Johansen2-1/+12
2008-07-13Add a new test for git-merge-resolveMiklos Vajna1-0/+46
2008-07-13t6021: add a new test for git-merge-resolveMiklos Vajna1-0/+4
2008-07-13Fix quadratic performance in rewrite_one.Alexander N. Gavrilov1-6/+24
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer58-233/+247
2008-07-13t/test-lib.sh: exit with small negagive int is ok with test_must_failStephan Beyer1-1/+1
2008-07-13git-am: Do not exit silently if committer is unsetStephan Beyer1-1/+2
2008-07-13bash completion: Improve responsiveness of git-log completionShawn O. Pearce1-12/+16
2008-07-13Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin3-5/+5
2008-07-12t0004: fix timing bugJunio C Hamano1-9/+10
2008-07-11Add pretty format %aN which gives the author name, respecting .mailmapJohannes Schindelin2-2/+27
2008-07-11We need to check for msys as well as Windows in add--interactive.Mike Pape1-1/+1
2008-07-11Convert CR/LF to LF in tag signaturesJohannes Schindelin1-0/+10
2008-07-11Fixed text file auto-detection: treat EOF character 032 at the end of file as...Dmitry Kakurin1-0/+4
2008-07-11make remove-dashes: apply to scripts and programs as well, not just to builtinsMiklos Vajna2-10/+10
2008-07-11git-bisect: use dash-less form on git bisect logMiklos Vajna1-4/+8
2008-07-11t1007-hash-object.sh: use quotes for the test descriptionMiklos Vajna1-1/+1
2008-07-11t0001-init.sh: change confusing directory nameMiklos Vajna1-3/+3
2008-07-11git-mailinfo: document the -n optionLukas Sandström2-2/+5
2008-07-11Fix backwards-incompatible handling of core.sharedRepositoryPetr Baudis2-1/+24
2008-07-10Teach merge.log to "git-merge" againJunio C Hamano2-0/+9
2008-07-10rerere: Separate libgit and builtin functionsStephan Beyer6-355/+390
2008-07-10builtin-rerere: more carefully find conflict markersOlivier Marin2-9/+33
2008-07-09apply: fix copy/rename breakageJunio C Hamano2-3/+27
2008-07-09Merge branch 'jk/pager-config'Junio C Hamano1-4/+47
2008-07-09Merge branch 'js/apply-root'Junio C Hamano3-1/+76
2008-07-09Merge branch 'jc/reflog-expire'Junio C Hamano1-19/+137
2008-07-09git-send-email: Fix authenticating on some servers when using TLS.Robert Shearman1-0/+3
2008-07-09revisions: refactor handle_revision_opt into parse_revision_opt.Pierre Habouzit4-23/+23
2008-07-09git-shortlog: migrate to parse-options partially.Pierre Habouzit1-58/+77
2008-07-09git-blame: fix lapsusPierre Habouzit1-1/+1
2008-07-09Provide fallback definitions of PRIu32 and PRIx32Johannes Sixt1-0/+8
2008-07-09t9100-git-svn-basic.sh: Fix determination of utf-8 localeRamsay Jones1-4/+4
2008-07-09t9113-*.sh: provide user feedback when test skippedRamsay Jones1-1/+7
2008-07-09Merge branch 'sp/maint-pack-memuse'Junio C Hamano1-0/+1
2008-07-09Correct pack memory leak causing git gc to try to exceed ulimitShawn O. Pearce1-0/+1
2008-07-09branch --merged/--no-merged: allow specifying arbitrary commitJunio C Hamano2-20/+57
2008-07-09branch --contains: default to HEADJunio C Hamano1-4/+8
2008-07-09parse-options: add PARSE_OPT_LASTARG_DEFAULT flagPierre Habouzit2-28/+28
2008-07-09Merge branch 'maint'Junio C Hamano8-8/+106
2008-07-08Start preparing release notes for 1.5.6.3Junio C Hamano2-1/+43
2008-07-08Documentation: update sections on naming revisions and revision rangesJunio C Hamano1-5/+15
2008-07-08Tone down warning about GNU Interactive ToolsJunio C Hamano1-11/+9
2008-07-08Avoid apache complaining about lack of server's FQDNMike Hommey1-0/+1
2008-07-08Skip t5540-http-push test when USE_CURL_MULTI is undefinedMike Hommey1-0/+7
2008-07-08Fix http-push testMike Hommey2-9/+11
2008-07-08Catch failures from t5540-http-pushMike Hommey1-3/+4
2008-07-08Git.pm: Add remote_refs() git-ls-remote frontendPetr Baudis2-5/+56
2008-07-08t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objectsBrandon Casey1-0/+34
2008-07-08completion: add branch options --contains --merged --no-mergedEric Raible1-1/+1
2008-07-08git-submodule - Fix bugs in adding an existing repo as a moduleMark Levedahl1-2/+1
2008-07-08install-doc-quick - use git --exec-path to find git-sh-setupMark Levedahl1-1/+1