summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-03-31Git 1.7.5-rc0v1.7.5-rc0Junio C Hamano2-2/+2
2011-03-30Merge branch 'maint'Junio C Hamano1-1/+1
2011-03-30parse-remote: typofixJunio C Hamano1-1/+1
2011-03-30Merge branch 'maint'Junio C Hamano7-53/+19
2011-03-30contrib/thunderbird-patch-inline: do not require bash to run the scriptMaxin john1-2/+2
2011-03-30t8001: check the exit status of the command being testedJunio C Hamano1-5/+6
2011-03-30strbuf.h: remove a tad stale docs-in-comment and reference api-doc insteadMichael Witten1-36/+1
2011-03-30Typos: t/READMEMichael Witten1-5/+4
2011-03-30Documentation/config.txt: make truth value of numbers more explicitCarlos Martín Nieto1-1/+1
2011-03-30git-pack-objects.txt: fix grammatical errorsStephen Boyd1-3/+3
2011-03-30parse-remote: replace unnecessary sed invocationStephen Boyd1-1/+2
2011-03-30Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano3-9/+14
2011-03-29tests: kill backgrounded processes more robustlyJeff King1-6/+6
2011-03-29Merge branch 'maint'Junio C Hamano1-3/+3
2011-03-29Merge branch 'jc/fetch-progressive-stride'Junio C Hamano1-4/+5
2011-03-29Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-sto...Junio C Hamano2-4/+6
2011-03-29vcs-svn: a void function shouldn't try to return somethingMichael Witten1-1/+2
2011-03-29Revert two "no-done" revertsJunio C Hamano2-7/+31
2011-03-29enable "no-done" extension only when serving over smart-httpJunio C Hamano1-3/+4
2011-03-29Fix potential local deadlock during fetch-packJunio C Hamano1-4/+5
2011-03-29enable "no-done" extension only when fetching over smart-httpJunio C Hamano1-1/+2
2011-03-29HOME must be set before calling git-init when creating test repositoriesAlex Riesen1-3/+3
2011-03-29tests: make sure input to sed is newline terminatedJonathan Nieder1-2/+6
2011-03-28Revert "fetch-pack: Implement no-done capability"Junio C Hamano1-15/+3
2011-03-28Revert "upload-pack: Implement no-done capability"Junio C Hamano1-16/+4
2011-03-28Merge branch 'maint'Junio C Hamano3-19/+20
2011-03-28git tag documentation grammar fixes and readability updatesMichael Witten1-18/+18
2011-03-28tests: fix overeager scrubbing of environment variablesJens Lehmann1-1/+10
2011-03-28grep: Add the option '--line-number'Joe Ratterman2-1/+2
2011-03-28Improve test for pthreads flagGiuseppe Bilotta1-0/+2
2011-03-28vcs-svn: add missing cast to printf argumentJonathan Nieder1-1/+2
2011-03-27vcs-svn: add missing cast to printf argumentJonathan Nieder1-1/+2
2011-03-26Update draft release note to 1.7.5Junio C Hamano1-2/+15
2011-03-26Merge branch 'mg/rev-list-n-parents'Junio C Hamano9-22/+163
2011-03-26Merge branch 'js/remove-unused-variables'Junio C Hamano7-19/+5
2011-03-26Merge branch 'jp/completion-help-alias'Junio C Hamano1-1/+1
2011-03-26Merge branch 'jc/index-update-if-able'Junio C Hamano4-13/+29
2011-03-26Merge branch 'jk/checkout-orphan-warning'Junio C Hamano2-1/+64
2011-03-26Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano4-2/+86
2011-03-26Merge branch 'nd/index-doc'Junio C Hamano1-0/+185
2011-03-26Merge branch 'jc/fetch-progressive-stride'Junio C Hamano1-3/+18
2011-03-26Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano11-83/+156
2011-03-26Merge git-gui 0.14.0Junio C Hamano14-437/+3371
2011-03-26vcs-svn: handle log message with embedded NULJonathan Nieder6-13/+94
2011-03-26vcs-svn: avoid unnecessary copying of log message and authorJonathan Nieder1-10/+10
2011-03-26vcs-svn: remove buffer_read_stringJonathan Nieder5-48/+17
2011-03-26vcs-svn: make reading of properties binary-safeJonathan Nieder2-14/+37
2011-03-25Sync with 1.7.4.2Junio C Hamano2-2/+11
2011-03-25Git 1.7.4.2v1.7.4.2Junio C Hamano2-1/+8
2011-03-25t7607: clean up stray untracked fileJeff King1-1/+2
2011-03-25t7607: mark known breakage in test 11 as fixedJeff King1-1/+1
2011-03-25gitweb: Fix handling of fractional timezones in parse_dateJakub Narebski1-2/+4
2011-03-25Merge branch 'ss/git-gui-mergetool'gitgui-0.14.0Pat Thoyts1-47/+54
2011-03-25git-gui: detect the use of MUI langauge packs on WindowsPat Thoyts1-0/+19
2011-03-24tests: avoid nonportable {foo,bar} globJonathan Nieder1-8/+8
2011-03-23rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano4-2/+86
2011-03-23doc: technical details about the index file formatJunio C Hamano1-37/+57
2011-03-23Merge branch 'kc/gitweb-pathinfo-w-anchor'Junio C Hamano1-7/+20
2011-03-23Merge branch 'jn/fortify-source-workaround'Junio C Hamano1-6/+11
2011-03-23Merge branch 'jn/maint-c99-format'Junio C Hamano6-81/+26
2011-03-23Merge branch 'lt/default-abbrev'Junio C Hamano5-3/+23
2011-03-23Merge branch 'pk/stash-apply-status-relative'Junio C Hamano2-1/+21
2011-03-23Merge branch 'jc/maint-diff-q-filter'Junio C Hamano2-1/+9
2011-03-23Merge branch 'pw/p4'Junio C Hamano2-1/+26
2011-03-23rev-list --min-parents,--max-parents: doc, test and completionMichael J Gruber4-3/+129
2011-03-23revision.c: introduce --min-parents and --max-parents optionsMichael J Gruber5-10/+32
2011-03-22Update draft release notes to 1.7.5Junio C Hamano1-0/+27
2011-03-22Merge branch 'mg/rev-list-one-side-only'Junio C Hamano10-69/+230
2011-03-22Merge branch 'js/maint-stash-index-copy'Junio C Hamano1-6/+5
2011-03-22Merge branch 'tl/p4'Junio C Hamano1-10/+27
2011-03-22Merge branch 'mg/doc-bisect-tweak-worktree'Junio C Hamano1-23/+38
2011-03-22Merge branch 'jn/test-sanitize-git-env'Junio C Hamano8-47/+11
2011-03-22Merge branch 'sp/maint-upload-pack-stop-early'Junio C Hamano1-3/+24
2011-03-22Merge branch 'sp/maint-fetch-pack-stop-early'Junio C Hamano1-2/+16
2011-03-22Merge branch 'jc/maint-rev-list-culled-boundary'Junio C Hamano2-1/+26
2011-03-22Merge branch 'jc/maint-fetch-alt'Junio C Hamano5-32/+118
2011-03-22Merge branch 'sg/complete-symmetric-diff'Junio C Hamano1-14/+17
2011-03-22Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano8-172/+265
2011-03-22Merge branch 'db/length-as-hash' into svn-feJonathan Nieder1-69/+105
2011-03-22vcs-svn: use strchr to find RFC822 delimiterDavid Barr1-2/+5
2011-03-22vcs-svn: implement perfect hash for top-level keysDavid Barr1-50/+59
2011-03-22vcs-svn: implement perfect hash for node-prop keysDavid Barr1-19/+43
2011-03-22vcs-svn: use strbuf for author, UUID, and URLDavid Barr5-30/+43
2011-03-22Merge branch 'maint'Junio C Hamano2-7/+9
2011-03-22vcs-svn: use strbuf for revision logDavid Barr1-20/+8
2011-03-22vcs-svn: improve reporting of input errorsJonathan Nieder2-5/+37
2011-03-22vcs-svn: make buffer_copy_bytes return length readJonathan Nieder2-10/+11
2011-03-22vcs-svn: make buffer_skip_bytes return length readJonathan Nieder3-8/+10
2011-03-22vcs-svn: improve support for reading large filesJonathan Nieder2-4/+4
2011-03-22git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'SZEDER Gábor1-3/+3
2011-03-22Remove unused variablesJohannes Schindelin7-19/+5
2011-03-22Fix sparse warningsStephen Boyd35-48/+43
2011-03-22git-completion: Add git help completion for aliasesJakob Pfender1-1/+1
2011-03-21update $GIT_INDEX_FILE when there are racily clean entriesJunio C Hamano1-1/+14
2011-03-21diff/status: refactor opportunistic index updateJunio C Hamano4-13/+16
2011-03-21t6009: use test_commit() from test-lib.shMichael J Gruber1-11/+4
2011-03-21bisect: visualize with git-log if gitk is unavailableJeff King1-4/+6
2011-03-20Rename core.abbrevlength back to core.abbrevJunio C Hamano2-2/+2
2011-03-20Update drart release notes to 1.7.5Junio C Hamano1-10/+13
2011-03-20Merge branch 'maint'Junio C Hamano3-1/+18
2011-03-20Update draft release notes to 1.7.4.2Junio C Hamano1-0/+9
2011-03-20Merge branch 'sp/maint-fd-limit' into maintJunio C Hamano4-19/+85
2011-03-20Merge branch 'mr/hpux' into maintJunio C Hamano2-1/+5
2011-03-20Merge branch 'so/submodule-no-update-first-time' into maintJunio C Hamano2-0/+61
2011-03-20Merge branch 'mo/perl-bidi-pipe-envfix' into maintJunio C Hamano2-5/+30
2011-03-20Merge branch 'ae/better-template-failure-report' into maintJunio C Hamano4-4/+56
2011-03-20Work around broken ln on solaris as used in t8006Ben Walton1-1/+2
2011-03-20fetch-pack: use smaller handshake window for initial requestJunio C Hamano1-2/+4
2011-03-20fetch-pack: progressively use larger handshake windowsJunio C Hamano1-1/+6
2011-03-20fetch-pack: factor out hardcoded handshake window sizeJunio C Hamano1-3/+11
2011-03-20Add test: git stash shows status relative to current dirPiotr Krukowiecki1-0/+19
2011-03-20t/README: Add a note about running commands under valgrindCarlos Martín Nieto1-0/+7
2011-03-20checkout: tweak detached-orphan warning formatJeff King1-1/+4
2011-03-20checkout: clear commit marks after detached-orphan checkJeff King2-0/+26
2011-03-20checkout: add basic tests for detached-orphan warningJeff King1-0/+34
2011-03-19Merge branch 'mm/maint-log-n-with-diff-filtering'Junio C Hamano5-1/+26
2011-03-19Merge branch 'mg/rev-list-n-reverse-doc'Junio C Hamano2-161/+163
2011-03-19Merge branch 'js/rerere-forget-always-take-pathspec'Junio C Hamano2-4/+7
2011-03-19Merge branch 'ab/i18n-basic'Junio C Hamano6-0/+93
2011-03-19Merge branch 'uk/ls-remote-in-get-remote-url'Junio C Hamano3-52/+12
2011-03-19Merge branch 'ss/mergetool--lib'Junio C Hamano5-113/+130
2011-03-19Merge branch 'jn/status-translatable'Junio C Hamano5-72/+166
2011-03-19Merge branch 'jk/trace-sifter'Junio C Hamano10-24/+121
2011-03-19Merge branch 'jk/format-patch-multiline-header'Junio C Hamano4-10/+121
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano9-10/+49
2011-03-19Merge branch 'maint'Junio C Hamano2-4/+8
2011-03-19grep: read patterns from stdin with -f -René Scharfe2-2/+9
2011-03-19gitweb: Always call parse_date with timezone parameterJakub Narebski1-3/+2
2011-03-19bisect: explain the rationale behind 125Junio C Hamano1-1/+6
2011-03-18Merge branch 'maint'Junio C Hamano1-5/+5
2011-03-18gitweb: fix #patchNN anchors when path_info is enabledKevin Cernekee1-7/+20
2011-03-18docs: fix grammar in gitattributes.txtAlexei Sholik1-5/+5
2011-03-17fetch-pack: objects in our alternates are available to usJunio C Hamano2-1/+13
2011-03-17refs_from_alternate: helper to use refs from alternatesJunio C Hamano4-32/+106
2011-03-17Name make_*_path functions more accuratelyCarlos Martín Nieto14-38/+52
2011-03-17run-command: prettify -D_FORTIFY_SOURCE workaroundJonathan Nieder1-6/+11
2011-03-17unbreak and eliminate NO_C99_FORMATJonathan Nieder5-55/+4
2011-03-17mktag: avoid %td in format stringJonathan Nieder1-26/+22
2011-03-17stash: copy the index using --index-output instead of cp -pJohannes Sixt1-6/+5
2011-03-17stash: fix incorrect quoting in cleanup of temporary filesJohannes Sixt1-1/+1
2011-03-16RelNotes/1.7.5.txt: typo and language fixesMichael J Gruber1-22/+9
2011-03-16Merge branch 'maint'Junio C Hamano27-178/+215
2011-03-16Prepare draft release notes to 1.7.4.2Junio C Hamano2-1/+43
2011-03-16Merge branch 'jn/maint-commit-missing-template' into maintJunio C Hamano2-4/+12
2011-03-16Merge branch 'lt/rename-no-extra-copy-detection' into maintJunio C Hamano9-45/+46
2011-03-16Merge branch 'jk/diffstat-binary' into maintJunio C Hamano2-10/+28
2011-03-16Merge branch 'mg/maint-difftool-vim-readonly' into maintJunio C Hamano1-2/+2
2011-03-16Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maintJunio C Hamano1-3/+19
2011-03-16Merge branch 'jk/fail-null-clone' into maintJunio C Hamano2-1/+14
2011-03-16Merge branch 'jh/push-default-upstream-configname' into maintJunio C Hamano4-9/+12
2011-03-16Merge branch 'mg/placeholders-are-lowercase' into maintJunio C Hamano15-42/+42
2011-03-16Merge branch 'mg/patch-id' into maintJunio C Hamano2-0/+38
2011-03-16Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maintJunio C Hamano2-8/+41
2011-03-16gitweb: highlight: replace tabs with spacesKevin Cernekee1-1/+1
2011-03-16diff --quiet: disable optimization when --diff-filter=X is usedJunio C Hamano2-1/+9
2011-03-16git-p4: test sync new branchPete Wyckoff1-0/+23
2011-03-16git-p4: fix sync new branch regressionPete Wyckoff1-1/+3
2011-03-16make_absolute_path: return the input path if it points to our bufferCarlos Martín Nieto1-0/+4
2011-03-16valgrind: ignore SSE-based strlen invalid readsCarlos Martín Nieto1-0/+6
2011-03-16vcs-svn: remove spurious semicolonsJonathan Nieder2-2/+2
2011-03-16diff --submodule: split into bite-sized piecesJonathan Nieder1-42/+61
2011-03-16cherry: split off function to print output linesJonathan Nieder1-16/+18
2011-03-16branch: split off function that writes tracking info and commit subjectJonathan Nieder1-21/+27
2011-03-16standardize brace placement in struct definitionsJonathan Nieder17-88/+44
2011-03-16compat: make gcc bswap an inline functionJonathan Nieder1-8/+10
2011-03-16enums: omit trailing comma for portabilityJonathan Nieder2-2/+2
2011-03-16Merge branch 'nd/struct-pathspec'Junio C Hamano1-3/+3
2011-03-15declare 1-bit bitfields to be unsignedJonathan Nieder1-3/+3
2011-03-15git-p4: Fix error message crash in P4Sync.commit.Tor Arvid Lund1-1/+1
2011-03-15Teach git-p4 to ignore case in perforce filenames if configured.Tor Arvid Lund1-7/+20
2011-03-15git-p4: Teach gitConfig method about arguments.Tor Arvid Lund1-2/+6
2011-03-15git-bisect.txt: example for bisecting with hot-fixMichael J Gruber1-0/+33
2011-03-15git-bisect.txt: streamline run presentationMichael J Gruber1-26/+8
2011-03-15Update draft release notes to 1.7.5Junio C Hamano1-3/+33
2011-03-15Merge branch 'jk/strbuf-vaddf'Junio C Hamano7-64/+38
2011-03-15Merge branch 'mm/push-default-advice'Junio C Hamano1-7/+24
2011-03-15Merge branch 'jn/maint-instaweb-plack-fix'Junio C Hamano1-2/+4
2011-03-15Merge branch 'sp/maint-fd-limit'Junio C Hamano4-19/+85
2011-03-15Merge branch 'jc/checkout-orphan-warning'Junio C Hamano1-6/+95
2011-03-15Merge branch 'jh/maint-do-not-track-non-branches'Junio C Hamano4-18/+39
2011-03-15Merge branch 'fk/maint-cvsimport-early-failure'Junio C Hamano1-1/+3
2011-03-15Merge branch 'jc/maint-apply-report-offset'Junio C Hamano1-2/+14
2011-03-15Merge branch 'jc/maint-apply-no-double-patch'Junio C Hamano1-1/+6
2011-03-15Merge branch 'mr/hpux'Junio C Hamano2-1/+5
2011-03-15Documentation: running test with --debug keeps "trash" directoryPiotr Krukowiecki1-0/+4
2011-03-15Merge branch 'jk/doc-credits' of git://github.com/peff/gitJunio C Hamano138-1133/+25
2011-03-15tests: scrub environment of GIT_* variablesJonathan Nieder1-18/+5
2011-03-15config: drop support for GIT_CONFIG_NOGLOBALJonathan Nieder7-16/+4
2011-03-15gitattributes: drop support for GIT_ATTR_NOGLOBALJonathan Nieder1-6/+1
2011-03-15tests: suppress system gitattributesJonathan Nieder1-1/+2
2011-03-15tests: stop worrying about obsolete environment variablesJonathan Nieder1-7/+0
2011-03-15upload-pack: Implement no-done capabilityShawn O. Pearce1-4/+16
2011-03-15fetch-pack: Implement no-done capabilityShawn O. Pearce1-3/+15
2011-03-14upload-pack: More aggressively send 'ACK %s ready'Shawn O. Pearce1-0/+9
2011-03-14fetch-pack: Finish negotation if remote replies "ACK %s ready"Shawn O. Pearce1-0/+2
2011-03-14list-objects.c: don't add an unparsed NULL as a pending treeJunio C Hamano2-1/+33
2011-03-14Merge branch 'sp/maint-smart-http-sans-100-continue'Junio C Hamano1-1/+1
2011-03-14smart-http: Really never use Expect: 100-continueShawn O. Pearce1-1/+1
2011-03-14Documentation: "rebase <onto> <that>" stays on <that> branch upon exitDrew Northup1-2/+3
2011-03-14object.h: Remove obsolete struct object_refsJakob Pfender1-5/+0